commit 6e3d6daa3753be0ce170c1140cddd945e01e0a03
author Dianne Hackborn <hackbod@google.com> Fri Jun 15 12:05:27 2012 -0700
committer Dianne Hackborn <hackbod@google.com> Fri Jun 15 12:12:56 2012 -0700
tree 816d4e37a2e1f7bdf8b8c683bb0682520f439651
parent 734f0214ec04e6c734aeec78d15f6db478cfb55c

Fix issue #6636731: Mariner animation ring gets stuck

Weren't cleaning out any ActivityOptions that are still attached
to a finishing activity.

Bug: 6636731
Change-Id: If0520bbcbf1d4ce19d46ff769918893cefda9c87

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 1eef2cf..e2d6d98 100755
--- a/services/java/com/android/server/am/ActivityStack.java
+++ b/services/java/com/android/server/am/ActivityStack.java
@@ -1055,7 +1055,9 @@
             mHandler.removeMessages(STOP_TIMEOUT_MSG, r);
             r.stopped = true;
             r.state = ActivityState.STOPPED;
-            if (!r.finishing) {
+            if (r.finishing) {
+                r.clearOptionsLocked();
+            } else {
                 if (r.configDestroy) {
                     destroyActivityLocked(r, true, false, "stop-config");
                     resumeTopActivityLocked(null);