commit 16c3220734f3cbf32c0148d82815d93e2f28af65
author Craig Mautner <cmautner@google.com> Mon Sep 09 21:55:20 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Sep 09 21:55:20 2013 +0000
tree 2b5806ca79c68b2d395d4a4b40f4a8401651d993
parent 4d0b9abae70bdf9a083c3ff7c92088e47637c57a
parent e5273b422e5d8deb22990992f4c72130e6e88ccf

Merge "Do not enter resumeTopActivity recursively." into klp-dev

services/java/com/android/server/am/ActivityStack.java

diff --git a/services/java/com/android/server/am/ActivityStack.java b/services/java/com/android/server/am/ActivityStack.java
index 8d27c5c..2b76e71 100644
--- a/services/java/com/android/server/am/ActivityStack.java
+++ b/services/java/com/android/server/am/ActivityStack.java
@@ -1110,8 +1110,10 @@
                                 case PAUSED:
                                     // This case created for transitioning activities from
                                     // translucent to opaque {@link Activity#convertToOpaque}.
-                                    mStackSupervisor.mStoppingActivities.remove(r);
-                                    stopActivityLocked(r);
+                                    if (!mStackSupervisor.mStoppingActivities.contains(r)) {
+                                        mStackSupervisor.mStoppingActivities.add(r);
+                                    }
+                                    mStackSupervisor.scheduleIdleLocked();
                                     break;
 
                                 default: