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

Clear calling identity when requesting syncInputTransaction

Browse Source 
The syncInputTransaction can trigger a performSurfacePlacement which
could result in a callback to the client. In that case, the calling PID
will be incorrect since we didn't clear the calling identity before
requesting the performSurfacePlacement.

Bug: 154665556
Test: Hard to reproduce. Existing tests pass
Change-Id: Id7c35d356cfc435e2de225e4e0d3979751c5c7d4
Merged-In: Id7c35d356cfc435e2de225e4e0d3979751c5c7d4
This commit is contained in:
chaviw
2020-05-20 11:34:52 -07:00
parent 1def7eb623
commit f87ea83f41
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
services/core/java/com/android/server/wm/WindowManagerService.java
View File

@@ -7717,14 +7717,19 @@ public class WindowManagerService extends IWindowManager.Stub
@Override
public void syncInputTransactions() {
waitForAnimationsToComplete();
long token = Binder.clearCallingIdentity();
try {
waitForAnimationsToComplete();
synchronized (mGlobalLock) {
mWindowPlacerLocked.performSurfacePlacementIfScheduled();
mRoot.forAllDisplays(displayContent ->
synchronized (mGlobalLock) {
mWindowPlacerLocked.performSurfacePlacementIfScheduled();
mRoot.forAllDisplays(displayContent ->
displayContent.getInputMonitor().updateInputWindowsImmediately());
}
new SurfaceControl.Transaction().syncInputWindows().apply(true);
} finally {
Binder.restoreCallingIdentity(token);
}
new SurfaceControl.Transaction().syncInputWindows().apply(true);
}
private void waitForAnimationsToComplete() {