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

Commit 08406526 authored by Bryce Lee's avatar Bryce Lee Committed by android-build-merger
Browse files

Merge "Clear pending activity options when retrieved in... 

Merge "Clear pending activity options when retrieved in ActivityManagerService." into oc-mr1-dev am: 7e0e6e90
am: af63ced7

Change-Id: Ied784c5b0b20aca02780f6b6bb8d221d367cf279
parents 4b950cf6 af63ced7

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

+1 −1
Original line number Diff line number Diff line
@@ -13277,7 +13277,7 @@ public class ActivityManagerService extends IActivityManager.Stub 
            synchronized (this) {

                final ActivityRecord r = ActivityRecord.isInStackLocked(token);

                if (r != null) {

                    final ActivityOptions activityOptions = r.pendingOptions;

                    final ActivityOptions activityOptions = r.takeOptionsLocked();

                    return activityOptions == null ? null : activityOptions.toBundle();

                }

                return null;