am 621c35e4: am 765ddb4b: Merge "Separate sessionCreated and finishedEvents callbacks" into jb-mr2-dev

* commit '621c35e4fc83c2864a82da31aac767832ce86df6':
  Separate sessionCreated and finishedEvents callbacks
This commit is contained in:
Michael Wright
2013-03-22 03:42:25 +00:00
committed by Android Git Automerger
8 changed files with 41 additions and 30 deletions

View File

@@ -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;
@@ -563,10 +563,6 @@ public class InputMethodManagerService extends IInputMethodManager.Stub
mParentIMMS = imms;
}
@Override
public void finishedEvent(int seq, boolean handled) throws RemoteException {
}
@Override
public void sessionCreated(IInputMethodSession session) throws RemoteException {
mParentIMMS.onSessionCreated(mMethod, session);
@@ -2335,7 +2331,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();