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

Commit c7f43304 authored by Bryce Lee's avatar Bryce Lee
Browse files

Clear pending activity options when retrieved in ActivityManagerService. 

This behavior was removed in ag/26485556

Change-Id: Ib04e8f1ddf1057a7bf2cbd4c422956fc6129a501
Fixes: 65070883
Test: manual via the bug repro steps.
parent 91f4071f

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;