Merge "Remove stopping activity from activities to stop"

1 files changed, 3 insertions, 0 deletions

diff --git a/services/java/com/android/server/am/ActivityStack.java b/services/java/com/android/server/am/ActivityStack.java
index 4c7767c40155..dd71044b3754 100644
--- a/services/java/com/android/server/am/ActivityStack.java
+++ b/services/java/com/android/server/am/ActivityStack.java
@@ -1098,6 +1098,9 @@ final class ActivityStack {
                                 case RESUMED:
                                 case PAUSING:
                                 case PAUSED:
+                                    // This case created for transitioning activities from
+                                    // translucent to opaque {@link Activity#convertToOpaque}.
+                                    mStackSupervisor.mStoppingActivities.remove(r);
                                     stopActivityLocked(r);
                                     break;