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 
am: 88757bbb8b

Change-Id: I8a2e5818c9fe2f5f37a2c9354f2e08078e40995d
This commit is contained in:
Karthik Ravi Shankar
2018-03-20 03:50:28 +00:00
committed by android-build-merger
parent 4aa94a7c50 88757bbb8b
commit 48a8c94e5c
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;
}
synchronized(this) {
r.requestedVrComponent = (enabled) ? packageName : null;
// Clear the binder calling uid since this path may call moveToTask().
final long callingId = Binder.clearCallingIdentity();
try {
synchronized(this) {
r.requestedVrComponent = (enabled) ? packageName : null;
// Update associated state if this activity is currently focused
if (r == mStackSupervisor.getResumedActivityLocked()) {
applyUpdateVrModeLocked(r);
// Update associated state if this activity is currently focused
if (r == mStackSupervisor.getResumedActivityLocked()) {
applyUpdateVrModeLocked(r);
}
return 0;
}
return 0;
} finally {
Binder.restoreCallingIdentity(callingId);
}
}