Merge "Make IMMS#shouldPreventImeStartupLocked() more readable" (1699b5cd) · Commits · e / os / android_frameworks_base

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

+12 −15

Original line number	Diff line number	Diff line
		@@ -2595,24 +2595,21 @@ public final class InputMethodManagerService extends IInputMethodManager.Stub
		if (!mPreventImeStartupUnlessTextEditor) {
		return false;
		}

		final boolean imeVisibleAllowed =
		isSoftInputModeStateVisibleAllowed(unverifiedTargetSdkVersion, startInputFlags);

		return !(imeVisibleAllowed
		\|\| mShowRequested
		\|\| isNonPreemptibleImeLocked(selectedMethodId));
		if (mShowRequested) {
		return false;
		}
		if (isSoftInputModeStateVisibleAllowed(unverifiedTargetSdkVersion, startInputFlags)) {
		return false;
		}

		/** Return {@code true} if the given IME is non-preemptible like the tv remote service. */
		@GuardedBy("ImfLock.class")
		private boolean isNonPreemptibleImeLocked(@NonNull String selectedMethodId) {
		final InputMethodInfo imi = mMethodMap.get(selectedMethodId);
		if (imi != null) {
		return ArrayUtils.contains(mNonPreemptibleInputMethods, imi.getPackageName());
		if (imi == null) {
		return false;
		}
		if (ArrayUtils.contains(mNonPreemptibleInputMethods, imi.getPackageName())) {
		return false;
		}
		return true;
		}

		@GuardedBy("ImfLock.class")
		private boolean isSelectedMethodBoundLocked() {