Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6577b03b authored by Jorim Jaggi's avatar Jorim Jaggi Committed by android-build-merger
Browse files

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

am: 0ee14740

Change-Id: Ie005cb0fadc33748cd3e0930be2d45af25200afa
parents 4e881b9e 0ee14740

services/core/java/com/android/server/am/ActivityManagerService.java

+2 −1
Original line number Diff line number Diff line
@@ -5401,11 +5401,12 @@ public class ActivityManagerService extends IActivityManager.Stub 














        final int callingPid = Binder.getCallingPid();















        final int callingUid = Binder.getCallingUid();













        final SafeActivityOptions safeOptions = SafeActivityOptions.fromBundle(bOptions);















        final long origId = Binder.clearCallingIdentity();















        try {















            synchronized (this) {















                return mStackSupervisor.startActivityFromRecents(callingPid, callingUid, taskId,













                        SafeActivityOptions.fromBundle(bOptions));













                        safeOptions);















            }















        } finally {















            Binder.restoreCallingIdentity(origId);