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

Simplify IMMS#reportPerceptibleAsync()

Browse Source 
IMMS#mCurFocusedWindow is guaranteed to be associated with the current
IME client process.  As long as the calling process has the same
window token, checking calledFromValidUserLocked() is just redundant
and could even make it a bit unclear about what security model we are
enforcing there.

Bug: 34886274
Test: presubmit
Change-Id: Iafb2b6d82fcccb4a33eceebff3d08b96fde8dc03
This commit is contained in:
Yohei Yukawa
2022-07-12 19:33:20 -07:00
parent 7e29c3b0d2
commit aff7c622da
1 changed files with 4 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3430,19 +3430,12 @@ public final class InputMethodManagerService extends IInputMethodManager.Stub
public void reportPerceptibleAsync(IBinder windowToken, boolean perceptible) {
Objects.requireNonNull(windowToken, "windowToken must not be null");
synchronized (ImfLock.class) {
if (!calledFromValidUserLocked()) {
if (mCurFocusedWindow != windowToken || mCurPerceptible == perceptible) {
return;
}
final long ident = Binder.clearCallingIdentity();
try {
if (mCurFocusedWindow == windowToken
&& mCurPerceptible != perceptible) {
mCurPerceptible = perceptible;
updateSystemUiLocked(mImeWindowVis, mBackDisposition);
}
} finally {
Binder.restoreCallingIdentity(ident);
}
mCurPerceptible = perceptible;
Binder.withCleanCallingIdentity(() ->
updateSystemUiLocked(mImeWindowVis, mBackDisposition));
}
}