Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8ea553d0 authored by Craig Mautner's avatar Craig Mautner Committed by Android Git Automerger
Browse files

am 8f2adcb1: am 228cefa8: am 3fb2b713: Merge "[ActivityManager] Reduce report... 

am 8f2adcb1: am 228cefa8: am 3fb2b713: Merge "[ActivityManager] Reduce report ANR on wrong activity."

* commit '8f2adcb1':
  [ActivityManager] Reduce report ANR on wrong activity.
parents e9abc279 8f2adcb1

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

100644 → 100755
+1 −1
Original line number Diff line number Diff line
@@ -956,8 +956,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) {