Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a0b404f0 authored by Tobias Lindskog's avatar Tobias Lindskog Committed by android-build-merger
Browse files

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

am: f61a27c0

Change-Id: I7c2a7ec65288199584971de895273918af267b7c
parents ef400a48 f61a27c0

services/core/java/com/android/server/am/AppErrors.java

+3 −0
Original line number Diff line number Diff line
@@ -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