Merge "[AM] Skip unnessary ANR when process already died." am: 831a4aea1e

am: 57341808f1 Change-Id: I95e71746ddf33247da1b81c9036b3f46d89f446e
2016-09-16 18:30:41 +00:00
parent a139f6bb27 57341808f1
commit 7aafc81c2e
1 changed files with 3 additions and 0 deletions
--- a/services/core/java/com/android/server/am/AppErrors.java
+++ b/services/core/java/com/android/server/am/AppErrors.java
@@ -762,6 +762,9 @@ class AppErrors {
            } else if (app.killedByAm) {
                Slog.i(TAG, "App already killed by AM skipping ANR: " + app + " " + annotation);
                return;
+            } else if (app.killed) {
+                Slog.i(TAG, "Skipping died app ANR: " + app + " " + annotation);
+                return;
            }

            // In case we come through here for the same app before completing