Merge "[AM] Skip unnessary ANR when process already died."

am: 831a4aea1e Change-Id: Ib8c0ffa8d50bb5a3fbc2d8f35274a8301494cd93
2016-09-16 18:26:10 +00:00
parent 9c24e04b9e 831a4aea1e
commit 57341808f1
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
@@ -756,6 +756,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