Merge "Skip ANR for processes that have been killed" am: 9d9cf5b383

am: b35b5f2bd1 Change-Id: Iee85d717feac0d7652993d90d4157052dc4292c1
2016-09-14 14:06:30 +00:00
parent c9f86e1256 b35b5f2bd1
commit f61a27c096
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
@@ -759,6 +759,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