diff options
| author | 2016-09-14 14:11:55 +0000 | |
|---|---|---|
| committer | 2016-09-14 14:11:55 +0000 | |
| commit | a0b404f09dfb73411b51903630cfe8b3003efdab (patch) | |
| tree | b40d4787aa9181732eeaf9df7b7724e8b31224f5 | |
| parent | ef400a48b1f6649b7d546e9e30fdaff2e26c5caf (diff) | |
| parent | f61a27c09658a631866326d0787fb56c3c44e129 (diff) | |
Merge "Skip ANR for processes that have been killed" am: 9d9cf5b383 am: b35b5f2bd1
am: f61a27c096
Change-Id: I7c2a7ec65288199584971de895273918af267b7c
| -rw-r--r-- | services/core/java/com/android/server/am/AppErrors.java | 3 |
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 0c67c75dc3e8..337fcec21607 100644 --- a/services/core/java/com/android/server/am/AppErrors.java +++ b/services/core/java/com/android/server/am/AppErrors.java @@ -768,6 +768,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 |