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

Merge "Fix SafeActivityOptions construction in startActivityFromRecents" into pi-dev

Browse Source
This commit is contained in:
Jorim Jaggi
2018-03-13 15:34:52 +00:00
committed by Android (Google) Code Review
parent 5dbde05f06 1282bc2f8d
commit 0ee147406d
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -5401,11 +5401,12 @@ public class ActivityManagerService extends IActivityManager.Stub
final int callingPid = Binder.getCallingPid(); final int callingPid = Binder.getCallingPid();
final int callingUid = Binder.getCallingUid(); final int callingUid = Binder.getCallingUid();
final SafeActivityOptions safeOptions = SafeActivityOptions.fromBundle(bOptions);
final long origId = Binder.clearCallingIdentity(); final long origId = Binder.clearCallingIdentity();
try { try {
synchronized (this) { synchronized (this) {
return mStackSupervisor.startActivityFromRecents(callingPid, callingUid, taskId, return mStackSupervisor.startActivityFromRecents(callingPid, callingUid, taskId,
SafeActivityOptions.fromBundle(bOptions)); safeOptions);
} }
} finally { } finally {
Binder.restoreCallingIdentity(origId); Binder.restoreCallingIdentity(origId);