Merge "Fix a wrong UID can be logged" (73e3d177) · Commits · e / os / android_frameworks_base

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

+11 −11

Original line number	Diff line number	Diff line
		@@ -1660,8 +1660,6 @@ public class InputMethodManagerService extends IInputMethodManager.Stub

		@Override
		public void updateStatusIcon(IBinder token, String packageName, int iconId) {
		long ident = Binder.clearCallingIdentity();
		try {
		synchronized (mMethodMap) {
		if (!calledWithValidToken(token)) {
		final int uid = Binder.getCallingUid();
		@@ -1669,6 +1667,8 @@ public class InputMethodManagerService extends IInputMethodManager.Stub
		+ " token:" + token);
		return;
		}
		final long ident = Binder.clearCallingIdentity();
		try {
		if (iconId == 0) {
		if (DEBUG) Slog.d(TAG, "hide the small icon for the input method");
		if (mStatusBar != null) {
		@@ -1693,11 +1693,11 @@ public class InputMethodManagerService extends IInputMethodManager.Stub
		mStatusBar.setIconVisibility(mSlotIme, true);
		}
		}
		}
		} finally {
		Binder.restoreCallingIdentity(ident);
		}
		}
		}

		private boolean shouldShowImeSwitcherLocked(int visibility) {
		if (!mShowOngoingImeSwitcherForPhones) return false;