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

Commit 7e0e6e90 authored by Bryce Lee's avatar Bryce Lee Committed by Android (Google) Code Review
Browse files

Merge "Clear pending activity options when retrieved in ActivityManagerService." into oc-mr1-dev

parents 83d0cd22 c7f43304

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

+1 −1
Original line number Diff line number Diff line
@@ -13350,7 +13350,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;