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

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

Browse Source 
Cherry-pick from aosp to lmp-dev

Sympton:
During testing, skip kill native crash process manually because it
will continue to die by default.

Root Cause:
Large process may take some time to do coredump.In auto test, crash
process will be killed immediately that results incomplete coredump
file.

Solution:
If the tester (IActivityController) will handle app crash event,
Do not kill native crashed process if the rom is debuggable.

Change-Id: Ia360af147d694125d440e5ba2f958c4759a50494

Conflicts:
	services/java/com/android/server/am/ActivityManagerService.java
This commit is contained in:
riddle_hsu
2014-07-31 00:15:05 +08:00
committed by Craig Mautner
parent ebbbb2cfc3
commit 214be42ea6
1 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
services/core/java/com/android/server/am/ActivityManagerService.java
View File

@@ -10966,11 +10966,17 @@ public final class ActivityManagerService extends ActivityManagerNative
int uid = r != null ? r.info.uid : Binder.getCallingUid();
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 (r != null) {
Process.killProcessGroup(uid, 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);
if (r != null) {
Process.killProcessGroup(uid, pid);
}
}
return;
}