Merge "Simplify IMMS#showInputMethodMenu() a bit" (68b18273) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/inputmethod/InputMethodManagerService.java

+4 −8

Original line number	Diff line number	Diff line
		@@ -3824,19 +3824,15 @@ public class InputMethodManagerService extends IInputMethodManager.Stub
		if (DEBUG) Slog.v(TAG, "Current IME: " + lastInputMethodId);

		synchronized (mMethodMap) {
		final HashMap<InputMethodInfo, List<InputMethodSubtype>> immis =
		mSettings.getExplicitlyOrImplicitlyEnabledInputMethodsAndSubtypeListLocked(
		mContext);
		if (immis == null \|\| immis.size() == 0) {
		final List<ImeSubtypeListItem> imList =
		mSwitchingController.getSortedInputMethodAndSubtypeListLocked(
		showAuxSubtypes, isScreenLocked);
		if (imList.isEmpty()) {
		return;
		}

		hideInputMethodMenuLocked();

		final List<ImeSubtypeListItem> imList =
		mSwitchingController.getSortedInputMethodAndSubtypeListLocked(
		showAuxSubtypes, isScreenLocked);

		if (lastInputMethodSubtypeId == NOT_A_SUBTYPE_ID) {
		final InputMethodSubtype currentSubtype = getCurrentInputMethodSubtypeLocked();
		if (currentSubtype != null) {