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

Merge "Fix the binder calling identity in setVrMode" into pi-dev

Browse Source
This commit is contained in:
Karthik Ravi Shankar
2018-03-19 22:55:52 +00:00
committed by Android (Google) Code Review
parent 7723aed494 96090ef9dc
commit 88757bbb8b
1 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
services/core/java/com/android/server/am/ActivityManagerService.java
View File

@@ -14288,14 +14288,20 @@ public class ActivityManagerService extends IActivityManager.Stub
return err; return err;
} }
synchronized(this) { // Clear the binder calling uid since this path may call moveToTask().
r.requestedVrComponent = (enabled) ? packageName : null; final long callingId = Binder.clearCallingIdentity();
try {
synchronized(this) {
r.requestedVrComponent = (enabled) ? packageName : null;
// Update associated state if this activity is currently focused // Update associated state if this activity is currently focused
if (r == mStackSupervisor.getResumedActivityLocked()) { if (r == mStackSupervisor.getResumedActivityLocked()) {
applyUpdateVrModeLocked(r); applyUpdateVrModeLocked(r);
}
return 0;
} }
return 0; } finally {
Binder.restoreCallingIdentity(callingId);
} }
} }