diff options
author | Michael Wright <michaelwr@google.com> | 2013-03-22 03:40:05 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2013-03-22 03:40:05 +0000 |
commit | 621c35e4fc83c2864a82da31aac767832ce86df6 (patch) | |
tree | b068592c8e1caee36befdc380d88a477ba2ab49f /services/java/com/android/server/InputMethodManagerService.java | |
parent | f2cf401c03c494e62d9f92109240090d2e1c4062 (diff) | |
parent | 765ddb4bf42634cc729017503833c3b077e4f29c (diff) |
am 765ddb4b: Merge "Separate sessionCreated and finishedEvents callbacks" into jb-mr2-dev
* commit '765ddb4bf42634cc729017503833c3b077e4f29c':
Separate sessionCreated and finishedEvents callbacks
Diffstat (limited to 'services/java/com/android/server/InputMethodManagerService.java')
-rw-r--r-- | services/java/com/android/server/InputMethodManagerService.java | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/services/java/com/android/server/InputMethodManagerService.java b/services/java/com/android/server/InputMethodManagerService.java index f6c9d8273513..0863bd6e9128 100644 --- a/services/java/com/android/server/InputMethodManagerService.java +++ b/services/java/com/android/server/InputMethodManagerService.java @@ -23,7 +23,7 @@ import com.android.internal.os.SomeArgs; import com.android.internal.util.FastXmlSerializer; import com.android.internal.view.IInputContext; import com.android.internal.view.IInputMethod; -import com.android.internal.view.IInputMethodCallback; +import com.android.internal.view.IInputSessionCallback; import com.android.internal.view.IInputMethodClient; import com.android.internal.view.IInputMethodManager; import com.android.internal.view.IInputMethodSession; @@ -554,7 +554,7 @@ public class InputMethodManagerService extends IInputMethodManager.Stub } } - private static class MethodCallback extends IInputMethodCallback.Stub { + private static class MethodCallback extends IInputSessionCallback.Stub { private final IInputMethod mMethod; private final InputMethodManagerService mParentIMMS; @@ -564,10 +564,6 @@ public class InputMethodManagerService extends IInputMethodManager.Stub } @Override - public void finishedEvent(int seq, boolean handled) throws RemoteException { - } - - @Override public void sessionCreated(IInputMethodSession session) throws RemoteException { mParentIMMS.onSessionCreated(mMethod, session); } @@ -2330,7 +2326,7 @@ public class InputMethodManagerService extends IInputMethodManager.Stub args = (SomeArgs)msg.obj; try { ((IInputMethod)args.arg1).createSession( - (IInputMethodCallback)args.arg2); + (IInputSessionCallback)args.arg2); } catch (RemoteException e) { } args.recycle(); |