Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
TreeHugger Robot
2019-04-22 23:58:26 +00:00
committed by Android (Google) Code Review
parent ef25fb621b 8e3e445706
commit 095ab6c3c7
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
services/core/java/com/android/server/am/ActiveServices.java
View File

@@ -3830,8 +3830,11 @@ public final class ActiveServices {
void serviceTimeout(ProcessRecord proc) { void serviceTimeout(ProcessRecord proc) {
String anrMessage = null; String anrMessage = null;
synchronized(mAm) { synchronized(mAm) {
if (proc.isDebugging()) {
// The app's being debugged, ignore timeout.
return;
}
if (proc.executingServices.size() == 0 || proc.thread == null) { if (proc.executingServices.size() == 0 || proc.thread == null) {
return; return;
} }

2
services/core/java/com/android/server/am/ProcessRecord.java
View File

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