Merge "Clear calling identity when requesting syncInputTransaction" am: 38c11064f4

Change-Id: I3225b9ab62520ced5cd74121563afd83e26f0b47
This commit is contained in:
Chavi Weingarten
2020-05-21 22:38:02 +00:00
committed by Automerger Merge Worker

View File

@@ -7723,6 +7723,8 @@ public class WindowManagerService extends IWindowManager.Stub
@Override @Override
public void syncInputTransactions() { public void syncInputTransactions() {
long token = Binder.clearCallingIdentity();
try {
waitForAnimationsToComplete(); waitForAnimationsToComplete();
synchronized (mGlobalLock) { synchronized (mGlobalLock) {
@@ -7731,6 +7733,9 @@ public class WindowManagerService extends IWindowManager.Stub
displayContent.getInputMonitor().updateInputWindowsImmediately()); displayContent.getInputMonitor().updateInputWindowsImmediately());
} }
new SurfaceControl.Transaction().syncInputWindows().apply(true); new SurfaceControl.Transaction().syncInputWindows().apply(true);
} finally {
Binder.restoreCallingIdentity(token);
}
} }
private void waitForAnimationsToComplete() { private void waitForAnimationsToComplete() {