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

Commit 095ab6c3 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "No service timeout when debbuger is attached" into qt-dev

parents ef25fb62 8e3e4457

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

+4 −1
Original line number Diff line number Diff line
@@ -3830,8 +3830,11 @@ public final class ActiveServices { 


    void serviceTimeout(ProcessRecord proc) {

        String anrMessage = null;



        synchronized(mAm) {

            if (proc.isDebugging()) {

                // The app's being debugged, ignore timeout.

                return;

            }

            if (proc.executingServices.size() == 0 || proc.thread == null) {

                return;

            }

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

+1 −1
Original line number Diff line number Diff line
@@ -1557,7 +1557,7 @@ class ProcessRecord implements WindowProcessListener { 
                mService.mBatteryStatsService.noteProcessAnr(processName, uid);

            }



            if (isSilentAnr()) {

            if (isSilentAnr() && !isDebugging()) {

                kill("bg anr", true);

                return;

            }