diff options
| author | Craig Mautner <cmautner@google.com> | 2014-07-31 03:53:15 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-07-30 19:31:16 +0000 |
| commit | 6a58309e734086a21580dd8d9175ac1817ca3ab2 (patch) | |
| tree | 96ea6b09727dea5725d8a2551e92409542e5a433 | |
| parent | 905fe15ea09238ed132ccd347e078892b6b49ddf (diff) | |
| parent | 8062b9534f3d922bd3a5e55f6b0b94c843bf796d (diff) | |
| download | base-6a58309e734086a21580dd8d9175ac1817ca3ab2.tar.gz | |
Merge "[ActivityManager] Prevent coredump file may not complete for testing."
| -rw-r--r--[-rwxr-xr-x] | services/java/com/android/server/am/ActivityManagerService.java | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/services/java/com/android/server/am/ActivityManagerService.java b/services/java/com/android/server/am/ActivityManagerService.java index ae9807048ac7..0751c2b3e816 100755..100644 --- a/services/java/com/android/server/am/ActivityManagerService.java +++ b/services/java/com/android/server/am/ActivityManagerService.java @@ -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) { |