Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove IMMS#MSG_SHOW_IM_SUBTYPE_ENABLER

Browse Source 
This CL inlines

  InputMethodManagerService#MSG_SHOW_IM_SUBTYPE_ENABLER

handler as it has always been executed from the calling thread.

There should be no observable behavior change, except for the case

  InputMethodManagerService#getCurMethodLocked()

was returning null and the client process was receiving NPE, which
should no longer happen.

Bug: 215609403
Test: presubmit
Change-Id: I868af935ffdc794669c5cb5d0437c919533ac2ab
This commit is contained in:
Yohei Yukawa
2022-01-20 20:40:59 -08:00
parent 6495e3c93b
commit 040e689994
1 changed files with 1 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
services/core/java/com/android/server/inputmethod/InputMethodManagerService.java
View File

@@ -219,7 +219,6 @@ public class InputMethodManagerService extends IInputMethodManager.Stub
}
private static final int MSG_SHOW_IM_SUBTYPE_PICKER = 1;
private static final int MSG_SHOW_IM_SUBTYPE_ENABLER = 2;
private static final int MSG_SHOW_IM_CONFIG = 3;
private static final int MSG_UNBIND_INPUT = 1000;
@@ -3694,8 +3693,7 @@ public class InputMethodManagerService extends IInputMethodManager.Stub
if (!calledFromValidUserLocked()) {
return;
}
executeOrSendMessage(getCurMethodLocked(), mCaller.obtainMessageO(
MSG_SHOW_IM_SUBTYPE_ENABLER, inputMethodId));
showInputMethodAndSubtypeEnabler(inputMethodId);
}
}
@@ -4218,10 +4216,6 @@ public class InputMethodManagerService extends IInputMethodManager.Stub
mMenuController.showInputMethodMenu(showAuxSubtypes, displayId);
return true;
case MSG_SHOW_IM_SUBTYPE_ENABLER:
showInputMethodAndSubtypeEnabler((String)msg.obj);
return true;
case MSG_SHOW_IM_CONFIG:
showConfigureInputMethods();
return true;