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

2014-04-07 22:10:47 +00:00
parent dc97144b3f 309ca5d947
commit 3fb2b7132b
1 changed files with 1 additions and 1 deletions
--- a/services/java/com/android/server/am/ActivityRecord.java
+++ b/services/java/com/android/server/am/ActivityRecord.java
@@ -942,8 +942,8 @@ final class ActivityRecord {
        // 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) {