Merge "Fix issue #2325621: Runtime restart after launching Android keyboard setting." (5062a582) · Commits · e / os / android_frameworks_base

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

+56 −56

Original line number	Diff line number	Diff line
		@@ -1463,8 +1463,6 @@ public class InputMethodManagerService extends IInputMethodManager.Stub
		void showInputMethodMenu() {
		if (DEBUG) Slog.v(TAG, "Show switching menu");

		hideInputMethodMenu();

		final Context context = mContext;

		final PackageManager pm = context.getPackageManager();
		@@ -1479,20 +1477,23 @@ public class InputMethodManagerService extends IInputMethodManager.Stub
		return;
		}

		synchronized (mMethodMap) {
		hideInputMethodMenuLocked();

		int N = immis.size();

		mItems = new CharSequence[N];
		mIms = new InputMethodInfo[N];

		int j = 0;
		for (int i = 0; i < N; ++i) {
		InputMethodInfo property = immis.get(i);
		if (property == null) {
		i--;
		N--;
		continue;
		}
		mItems[i] = property.loadLabel(pm);
		mIms[i] = property;
		mItems[j] = property.loadLabel(pm);
		mIms[j] = property;
		j++;
		}

		int checkedItem = 0;
		@@ -1539,7 +1540,6 @@ public class InputMethodManagerService extends IInputMethodManager.Stub
		}
		});

		synchronized (mMethodMap) {
		mSwitchingDialog = mDialogBuilder.create();
		mSwitchingDialog.getWindow().setType(
		WindowManager.LayoutParams.TYPE_INPUT_METHOD_DIALOG);