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

Commit 6cec919c authored by Jing Ji's avatar Jing Ji Committed by Automerger Merge Worker
Browse files

Merge "Do not kill ANR-ed debugged application" into main am: 123ba0f5 am:... 

Merge "Do not kill ANR-ed debugged application" into main am: 123ba0f5 am: 60d47216 am: 22489ef4

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2873097



Change-Id: I8a1cd52d98a0f428ae9ce8522d931a88adc2b6f9
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 262c4ac0 22489ef4

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

+5 −0
Original line number Diff line number Diff line
@@ -299,6 +299,11 @@ class ProcessErrorStateRecord { 
        SparseBooleanArray lastPids = new SparseBooleanArray(20);

        ActivityManagerService.VolatileDropboxEntryStates volatileDropboxEntriyStates = null;



        if (mApp.isDebugging()) {

            Slog.i(TAG, "Skipping debugged app ANR: " + this + " " + annotation);

            return;

        }



        mApp.getWindowProcessController().appEarlyNotResponding(annotation, () -> {

            latencyTracker.waitingOnAMSLockStarted();

            synchronized (mService) {