summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Mark Lu <Mark_Lu@htc.com> 2016-09-16 18:26:10 +0000
committer android-build-merger <android-build-merger@google.com> 2016-09-16 18:26:10 +0000
commit57341808f1527326ab5f191f6e5d42e3d3a086d5 (patch)
treea31a2a1b3d07eb4e9f425736c91c167745709961
parent9c24e04b9e810acdb08868faab8008fa1c7ad9ba (diff)
parent831a4aea1ead1d8182793df98e51d2777d9ea731 (diff)
Merge "[AM] Skip unnessary ANR when process already died."
am: 831a4aea1e Change-Id: Ib8c0ffa8d50bb5a3fbc2d8f35274a8301494cd93
-rw-r--r--services/core/java/com/android/server/am/AppErrors.java3
1 files changed, 3 insertions, 0 deletions
diff --git a/services/core/java/com/android/server/am/AppErrors.java b/services/core/java/com/android/server/am/AppErrors.java
index 724f66f51ca2..ba799f2ca3d1 100644
--- 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