Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Make IMMS#shouldPreventImeStartupLocked() more readable"

Browse Source
This commit is contained in:
TreeHugger Robot
2022-10-06 14:05:50 +00:00
committed by Android (Google) Code Review
parent cc3e5be1a4 7a4e080f1c
commit 1699b5cd4a
1 changed files with 13 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
services/core/java/com/android/server/inputmethod/InputMethodManagerService.java
View File

@@ -2595,23 +2595,20 @@ public final class InputMethodManagerService extends IInputMethodManager.Stub
if (!mPreventImeStartupUnlessTextEditor) {
return false;
}
final boolean imeVisibleAllowed =
isSoftInputModeStateVisibleAllowed(unverifiedTargetSdkVersion, startInputFlags);
return !(imeVisibleAllowed
|| mShowRequested
|| isNonPreemptibleImeLocked(selectedMethodId));
}
/** 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 (mShowRequested) {
return false;
}
return false;
if (isSoftInputModeStateVisibleAllowed(unverifiedTargetSdkVersion, startInputFlags)) {
return false;
}
final InputMethodInfo imi = mMethodMap.get(selectedMethodId);
if (imi == null) {
return false;
}
if (ArrayUtils.contains(mNonPreemptibleInputMethods, imi.getPackageName())) {
return false;
}
return true;
}
@GuardedBy("ImfLock.class")