drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "[ActivityManager] Prevent coredump file may not complete for testing."

Browse Source
This commit is contained in:
Craig Mautner
2014-07-31 03:53:15 +00:00
committed by Gerrit Code Review
parent 905fe15ea0 8062b9534f
commit 6a58309e73
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
services/java/com/android/server/am/ActivityManagerService.java Executable file → Normal file
View File

@ -10083,9 +10083,15 @@ public final class ActivityManagerService extends ActivityManagerNative
int pid = r != null ? r.pid : Binder.getCallingPid();
if (!mController.appCrashed(name, pid,
shortMsg, longMsg, timeMillis, crashInfo.stackTrace)) {
Slog.w(TAG, "Force-killing crashed app " + name
+ " at watcher's request");
Process.killProcess(pid);
if ("1".equals(SystemProperties.get(SYSTEM_DEBUGGABLE, "0"))
&& "Native crash".equals(crashInfo.exceptionClassName)) {
Slog.w(TAG, "Skip killing native crashed app " + name
+ "(" + pid + ") during testing");
} else {
Slog.w(TAG, "Force-killing crashed app " + name
+ " at watcher's request");
Process.killProcess(pid);
}
return;
}
} catch (RemoteException e) {