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

Make IMMS#shouldPreventImeStartupLocked() more readable

Browse Source 
This is a mechanical refactoring with no behavior change for

  InputMethodManagerService#shouldPreventImeStartupLocked(),

which was added recently [1].

Most likely return-early pattern would be more readable and
maintainable for this kind of method.

There must be no observable behavior change in this CL.

 [1]: Id0aaa496ee46532d0e97c236df7e073947ababcd
      76a3c8c9b3

Bug: 234882948
Test: presubmit
Change-Id: Ic2d5164697523ec410b635b451fff1e4feb40830
This commit is contained in:
Yohei Yukawa
2022-10-05 16:21:22 -07:00
parent b179389164
commit 7a4e080f1c
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

@@ -2603,23 +2603,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")