commit 3fb2b7132b64c65163e7c6cd948e45f703e93687
author Craig Mautner <cmautner@google.com> Mon Apr 07 22:10:47 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Apr 07 22:10:47 2014 +0000
tree 5c65d767e7df3cf80efa9102647cc29a4336054e
parent dc97144b3f83bf6dae90493a6631afc6523dfce2
parent 309ca5d947fffc6a8196be5e5148333803d442af

Merge "[ActivityManager] Reduce report ANR on wrong activity."

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

diff --git a/services/java/com/android/server/am/ActivityRecord.java b/services/java/com/android/server/am/ActivityRecord.java
old mode 100644
new mode 100755
index 49f29fe..63a52e6
--- a/services/java/com/android/server/am/ActivityRecord.java
+++ b/services/java/com/android/server/am/ActivityRecord.java
@@ -942,8 +942,8 @@
         // for another app to start, then we have paused dispatching
         // for this activity.
         ActivityRecord r = this;
-        final ActivityStack stack = task.stack;
         if (r.waitingVisible) {
+            final ActivityStack stack = mStackSupervisor.getFocusedStack();
             // Hmmm, who might we be waiting for?
             r = stack.mResumedActivity;
             if (r == null) {