Merge "Access IMMS#mSettings only inside the lock" (019b018c) · Commits · e / os / android_frameworks_base

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

+8 −7

Original line number	Diff line number	Diff line
		@@ -901,7 +901,8 @@ public class InputMethodManagerService extends IInputMethodManager.Stub
		mPackagesToMonitorComponentChange.add(packageName);
		}

		private boolean isChangingPackagesOfCurrentUser() {
		@GuardedBy("mMethodMap")
		private boolean isChangingPackagesOfCurrentUserLocked() {
		final int userId = getChangingUserId();
		final boolean retval = userId == mSettings.getCurrentUserId();
		if (DEBUG) {
		@@ -914,10 +915,10 @@ public class InputMethodManagerService extends IInputMethodManager.Stub

		@Override
		public boolean onHandleForceStop(Intent intent, String[] packages, int uid, boolean doit) {
		if (!isChangingPackagesOfCurrentUser()) {
		synchronized (mMethodMap) {
		if (!isChangingPackagesOfCurrentUserLocked()) {
		return false;
		}
		synchronized (mMethodMap) {
		String curInputMethodId = mSettings.getSelectedInputMethod();
		final int N = mMethodList.size();
		if (curInputMethodId != null) {
		@@ -951,10 +952,10 @@ public class InputMethodManagerService extends IInputMethodManager.Stub

		@Override
		public void onSomePackagesChanged() {
		if (!isChangingPackagesOfCurrentUser()) {
		synchronized (mMethodMap) {
		if (!isChangingPackagesOfCurrentUserLocked()) {
		return;
		}
		synchronized (mMethodMap) {
		InputMethodInfo curIm = null;
		String curInputMethodId = mSettings.getSelectedInputMethod();
		final int N = mMethodList.size();