diff options
| author | Yohei Yukawa <yukawa@google.com> | 2017-02-10 13:39:10 -0800 |
|---|---|---|
| committer | Yohei Yukawa <yukawa@google.com> | 2017-02-11 02:56:48 +0000 |
| commit | 1a5838e966eab7a9f0dca71cabbc9922babb995e (patch) | |
| tree | dcf1ba51362caeb9b72f4080748ec5794a7490c0 /core/java/android/inputmethodservice/IInputMethodWrapper.java | |
| parent | 0a54d4bbed189357c82598918d819d3bf111d104 (diff) | |
Merge restartInput into startInput in internal IPC
As a preparation to start tracking all the event flows that
cause InputMethodManagerService#setImeWindowStatus(), this CL
merges an internal IPC method IInputMethod#restartInput() into
IInputMethod#startInput() in favor of simplicity.
Test: Done some quick manual testing to make sure that IME is
still working
Bug: 35079353
Change-Id: Ifda6f74ac1b1370d9e9a9fe60354b692121fdcb9
Diffstat (limited to 'core/java/android/inputmethodservice/IInputMethodWrapper.java')
| -rw-r--r-- | core/java/android/inputmethodservice/IInputMethodWrapper.java | 34 |
1 files changed, 9 insertions, 25 deletions
diff --git a/core/java/android/inputmethodservice/IInputMethodWrapper.java b/core/java/android/inputmethodservice/IInputMethodWrapper.java index 167d5a09a2dc..bdc301c41adf 100644 --- a/core/java/android/inputmethodservice/IInputMethodWrapper.java +++ b/core/java/android/inputmethodservice/IInputMethodWrapper.java @@ -61,7 +61,6 @@ class IInputMethodWrapper extends IInputMethod.Stub private static final int DO_SET_INPUT_CONTEXT = 20; private static final int DO_UNSET_INPUT_CONTEXT = 30; private static final int DO_START_INPUT = 32; - private static final int DO_RESTART_INPUT = 34; private static final int DO_CREATE_SESSION = 40; private static final int DO_SET_SESSION_ENABLED = 45; private static final int DO_REVOKE_SESSION = 50; @@ -166,24 +165,17 @@ class IInputMethodWrapper extends IInputMethod.Stub case DO_START_INPUT: { SomeArgs args = (SomeArgs)msg.obj; int missingMethods = msg.arg1; + boolean restarting = msg.arg2 != 0; IInputContext inputContext = (IInputContext)args.arg1; InputConnection ic = inputContext != null ? new InputConnectionWrapper(mTarget, inputContext, missingMethods) : null; EditorInfo info = (EditorInfo)args.arg2; info.makeCompatible(mTargetSdkVersion); - inputMethod.startInput(ic, info); - args.recycle(); - return; - } - case DO_RESTART_INPUT: { - SomeArgs args = (SomeArgs)msg.obj; - int missingMethods = msg.arg1; - IInputContext inputContext = (IInputContext)args.arg1; - InputConnection ic = inputContext != null - ? new InputConnectionWrapper(mTarget, inputContext, missingMethods) : null; - EditorInfo info = (EditorInfo)args.arg2; - info.makeCompatible(mTargetSdkVersion); - inputMethod.restartInput(ic, info); + if (restarting) { + inputMethod.restartInput(ic, info); + } else { + inputMethod.startInput(ic, info); + } args.recycle(); return; } @@ -265,17 +257,9 @@ class IInputMethodWrapper extends IInputMethod.Stub @Override public void startInput(IInputContext inputContext, @InputConnectionInspector.MissingMethodFlags final int missingMethods, - EditorInfo attribute) { - mCaller.executeOrSendMessage(mCaller.obtainMessageIOO(DO_START_INPUT, - missingMethods, inputContext, attribute)); - } - - @Override - public void restartInput(IInputContext inputContext, - @InputConnectionInspector.MissingMethodFlags final int missingMethods, - EditorInfo attribute) { - mCaller.executeOrSendMessage(mCaller.obtainMessageIOO(DO_RESTART_INPUT, - missingMethods, inputContext, attribute)); + EditorInfo attribute, boolean restarting) { + mCaller.executeOrSendMessage(mCaller.obtainMessageIIOO(DO_START_INPUT, + missingMethods, restarting ? 1 : 0, inputContext, attribute)); } @Override |