summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Treehugger Robot <treehugger-gerrit@google.com> 2016-09-14 13:54:36 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2016-09-14 13:54:37 +0000
commit9d9cf5b383f26c209b781dbca0723f69ff6913ba (patch)
tree652dbb9384565f0d1d5ddcf2e867e988cd1ff65a
parent796578f9a99b3503aed1fb61f891bd80aad87422 (diff)
parent313177dccacaf5fefd2954d90c065e35e5b03253 (diff)
Merge "Skip ANR for processes that have been killed"
-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 49106f42044e..724f66f51ca2 100644
--- a/services/core/java/com/android/server/am/AppErrors.java
+++ b/services/core/java/com/android/server/am/AppErrors.java
@@ -753,6 +753,9 @@ class AppErrors {
} else if (app.crashing) {
Slog.i(TAG, "Crashing app skipping ANR: " + app + " " + annotation);
return;
+ } else if (app.killedByAm) {
+ Slog.i(TAG, "App already killed by AM skipping ANR: " + app + " " + annotation);
+ return;
}
// In case we come through here for the same app before completing