From b93d234952704ac8acfe785364acc6bdafa2273a Mon Sep 17 00:00:00 2001 From: Yohei Yukawa Date: Thu, 20 Jan 2022 20:41:46 -0800 Subject: Remove IMMS#MSG_BIND_INPUT This CL inlines InputMethodManagerService#MSG_BIND_INPUT handler as it has always been executed from the calling thread. There should be no observable behavior change. Bug: 215609403 Test: presubmit Change-Id: Iab2c7f3bb3b41064359ea4100622e516670bfffc --- .../server/inputmethod/InputMethodManagerService.java | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/services/core/java/com/android/server/inputmethod/InputMethodManagerService.java b/services/core/java/com/android/server/inputmethod/InputMethodManagerService.java index 16794217bbc7..3e77a7764081 100644 --- a/services/core/java/com/android/server/inputmethod/InputMethodManagerService.java +++ b/services/core/java/com/android/server/inputmethod/InputMethodManagerService.java @@ -221,7 +221,6 @@ public class InputMethodManagerService extends IInputMethodManager.Stub private static final int MSG_SHOW_IM_SUBTYPE_PICKER = 1; private static final int MSG_SHOW_IM_CONFIG = 3; - private static final int MSG_BIND_INPUT = 1010; private static final int MSG_SHOW_SOFT_INPUT = 1020; private static final int MSG_HIDE_SOFT_INPUT = 1030; private static final int MSG_HIDE_CURRENT_INPUT_METHOD = 1035; @@ -2304,8 +2303,10 @@ public class InputMethodManagerService extends IInputMethodManager.Stub InputBindResult attachNewInputLocked(@StartInputReason int startInputReason, boolean initial) { if (!mBoundToMethod) { IInputMethod curMethod = getCurMethodLocked(); - executeOrSendMessage(curMethod, mCaller.obtainMessageOO( - MSG_BIND_INPUT, curMethod, mCurClient.binding)); + try { + curMethod.bindInput(mCurClient.binding); + } catch (RemoteException e) { + } mBoundToMethod = true; } @@ -4227,14 +4228,6 @@ public class InputMethodManagerService extends IInputMethodManager.Stub // --------------------------------------------------------- - case MSG_BIND_INPUT: - args = (SomeArgs)msg.obj; - try { - ((IInputMethod)args.arg1).bindInput((InputBinding)args.arg2); - } catch (RemoteException e) { - } - args.recycle(); - return true; case MSG_SHOW_SOFT_INPUT: args = (SomeArgs) msg.obj; try { -- cgit v1.2.3-59-g8ed1b