Merge "Fix an issue on installing 3rd-party IME by a non-primary user" into jb-mr1.1-dev (487f8e93) · Commits · e / os / android_frameworks_base

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

+4 −2

Original line number	Diff line number	Diff line
		@@ -444,8 +444,10 @@ public class InputMethodManagerService extends IInputMethodManager.Stub
		final int userId = getChangingUserId();
		final boolean retval = userId == mSettings.getCurrentUserId();
		if (DEBUG) {
		if (!retval) {
		Slog.d(TAG, "--- ignore this call back from a background user: " + userId);
		}
		}
		return retval;
		}

		@@ -658,7 +660,7 @@ public class InputMethodManagerService extends IInputMethodManager.Stub
		} catch (RemoteException e) {
		Slog.w(TAG, "Couldn't get current user ID; guessing it's 0", e);
		}
		mMyPackageMonitor.register(mContext, null, true);
		mMyPackageMonitor.register(mContext, null, UserHandle.ALL, true);

		// mSettings should be created before buildInputMethodListLocked
		mSettings = new InputMethodSettings(