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

am: 095ab6c3c7

Change-Id: Ic54c3c80063f670238c00a028d5aac55f142a4ec

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

@@ -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

@@ -1557,7 +1557,7 @@ class ProcessRecord implements WindowProcessListener {
                 mService.mBatteryStatsService.noteProcessAnr(processName, uid);
             }
 
-            if (isSilentAnr()) {
+            if (isSilentAnr() && !isDebugging()) {
                 kill("bg anr", true);
                 return;
             }