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

Merge "Don't dump stack traces for background ANRs." into nyc-dev

Browse Source
This commit is contained in:
Tim Murray
2016-07-14 00:00:29 +00:00
committed by Android (Google) Code Review
parent 419dbdb538 f0f9a82981
commit b2b203ae13
1 changed files with 39 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
services/core/java/com/android/server/am/AppErrors.java
View File

@@ -742,6 +742,12 @@ class AppErrors {
mService.updateCpuStatsNow(); mService.updateCpuStatsNow();
} }
// Unless configured otherwise, swallow ANRs in background processes & kill the process.
boolean showBackground = Settings.Secure.getInt(mContext.getContentResolver(),
Settings.Secure.ANR_SHOW_BACKGROUND, 0) != 0;
boolean isSilentANR;
synchronized (mService) { synchronized (mService) {
// PowerManager.reboot() can block for a long time, so ignore ANRs while shutting down. // PowerManager.reboot() can block for a long time, so ignore ANRs while shutting down.
if (mService.mShuttingDown) { if (mService.mShuttingDown) {
@@ -766,25 +772,29 @@ class AppErrors {
// Dump thread traces as quickly as we can, starting with "interesting" processes. // Dump thread traces as quickly as we can, starting with "interesting" processes.
firstPids.add(app.pid); firstPids.add(app.pid);
int parentPid = app.pid; // Don't dump other PIDs if it's a background ANR
if (parent != null && parent.app != null && parent.app.pid > 0) { isSilentANR = !showBackground && !app.isInterestingToUserLocked() && app.pid != MY_PID;
parentPid = parent.app.pid; if (!isSilentANR) {
} int parentPid = app.pid;
if (parentPid != app.pid) firstPids.add(parentPid); if (parent != null && parent.app != null && parent.app.pid > 0) {
parentPid = parent.app.pid;
}
if (parentPid != app.pid) firstPids.add(parentPid);
if (MY_PID != app.pid && MY_PID != parentPid) firstPids.add(MY_PID); if (MY_PID != app.pid && MY_PID != parentPid) firstPids.add(MY_PID);
for (int i = mService.mLruProcesses.size() - 1; i >= 0; i--) { for (int i = mService.mLruProcesses.size() - 1; i >= 0; i--) {
ProcessRecord r = mService.mLruProcesses.get(i); ProcessRecord r = mService.mLruProcesses.get(i);
if (r != null && r.thread != null) { if (r != null && r.thread != null) {
int pid = r.pid; int pid = r.pid;
if (pid > 0 && pid != app.pid && pid != parentPid && pid != MY_PID) { if (pid > 0 && pid != app.pid && pid != parentPid && pid != MY_PID) {
if (r.persistent) { if (r.persistent) {
firstPids.add(pid); firstPids.add(pid);
if (DEBUG_ANR) Slog.i(TAG, "Adding persistent proc: " + r); if (DEBUG_ANR) Slog.i(TAG, "Adding persistent proc: " + r);
} else { } else {
lastPids.put(pid, Boolean.TRUE); lastPids.put(pid, Boolean.TRUE);
if (DEBUG_ANR) Slog.i(TAG, "Adding ANR proc: " + r); if (DEBUG_ANR) Slog.i(TAG, "Adding ANR proc: " + r);
}
} }
} }
} }
@@ -807,10 +817,18 @@ class AppErrors {
info.append("Parent: ").append(parent.shortComponentName).append("\n"); info.append("Parent: ").append(parent.shortComponentName).append("\n");
} }
final ProcessCpuTracker processCpuTracker = new ProcessCpuTracker(true); ProcessCpuTracker processCpuTracker = new ProcessCpuTracker(true);
File tracesFile = mService.dumpStackTraces(true, firstPids, processCpuTracker, lastPids, String[] nativeProcs = NATIVE_STACKS_OF_INTEREST;
NATIVE_STACKS_OF_INTEREST); // don't dump native PIDs for background ANRs
File tracesFile = null;
if (isSilentANR) {
tracesFile = mService.dumpStackTraces(true, firstPids, null, lastPids,
null);
} else {
tracesFile = mService.dumpStackTraces(true, firstPids, processCpuTracker, lastPids,
nativeProcs);
}
String cpuInfo = null; String cpuInfo = null;
if (ActivityManagerService.MONITOR_CPU_USAGE) { if (ActivityManagerService.MONITOR_CPU_USAGE) {
@@ -854,14 +872,10 @@ class AppErrors {
} }
} }
// Unless configured otherwise, swallow ANRs in background processes & kill the process.
boolean showBackground = Settings.Secure.getInt(mContext.getContentResolver(),
Settings.Secure.ANR_SHOW_BACKGROUND, 0) != 0;
synchronized (mService) { synchronized (mService) {
mService.mBatteryStatsService.noteProcessAnr(app.processName, app.uid); mService.mBatteryStatsService.noteProcessAnr(app.processName, app.uid);
if (!showBackground && !app.isInterestingToUserLocked() && app.pid != MY_PID) { if (isSilentANR) {
app.kill("bg anr", true); app.kill("bg anr", true);
return; return;
} }