am 0fa45d93: Merge "Remove PendingActivityLaunches based on stack." into klp-modular-dev

* commit '0fa45d93f7265c130d5dc49a51130ed74db5cec9':
  Remove PendingActivityLaunches based on stack.

2 files changed, 3 insertions, 3 deletions

diff --git a/services/core/java/com/android/server/am/ActivityStack.java b/services/core/java/com/android/server/am/ActivityStack.java
index baa49fda4953..58f8d572c0c7 100755
--- a/services/core/java/com/android/server/am/ActivityStack.java
+++ b/services/core/java/com/android/server/am/ActivityStack.java
@@ -2692,7 +2692,6 @@ final class ActivityStack {
         // down to the max limit while they are still waiting to finish.
         mStackSupervisor.mFinishingActivities.remove(r);
         mStackSupervisor.mWaitingVisibleActivities.remove(r);
-        mStackSupervisor.removePendingActivityLaunchesLocked(r);
 
         // Remove any pending results.
         if (r.finishing && r.pendingResults != null) {
diff --git a/services/core/java/com/android/server/am/ActivityStackSupervisor.java b/services/core/java/com/android/server/am/ActivityStackSupervisor.java
index 611b28fe3974..7dcc7a0120f2 100644
--- a/services/core/java/com/android/server/am/ActivityStackSupervisor.java
+++ b/services/core/java/com/android/server/am/ActivityStackSupervisor.java
@@ -1859,10 +1859,10 @@ public final class ActivityStackSupervisor implements DisplayListener {
         }
     }
 
-    void removePendingActivityLaunchesLocked(ActivityRecord r) {
+    void removePendingActivityLaunchesLocked(ActivityStack stack) {
         for (int palNdx = mPendingActivityLaunches.size() - 1; palNdx >= 0; --palNdx) {
             PendingActivityLaunch pal = mPendingActivityLaunches.get(palNdx);
-            if (pal.r == r) {
+            if (pal.stack == stack) {
                 mPendingActivityLaunches.remove(palNdx);
             }
         }
@@ -3097,6 +3097,7 @@ public final class ActivityStackSupervisor implements DisplayListener {
                 long origId = Binder.clearCallingIdentity();
                 try {
                     mStack.finishAllActivitiesLocked(false);
+                    removePendingActivityLaunchesLocked(mStack);
                 } finally {
                     Binder.restoreCallingIdentity(origId);
                 }