summaryrefslogtreecommitdiff
path: root/core/java
diff options
context:
space:
mode:
authorEric Rowe <erowe@google.com>2013-09-09 14:14:28 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-09-09 14:14:28 -0700
commit279afa504e4a7f5ecdfbc9924aec13e7ca093bbc (patch)
treee1d0882c7f939b307903763eee0d20d7a7181c34 /core/java
parent6446e4595c84f31382b924244f4873ae35d61c3e (diff)
parentf2a24a0672db102008a24b2fbc207a2e489c9797 (diff)
am f2a24a06: am 93d71945: Merge "Add PID and application to Java crash printout" into klp-dev
* commit 'f2a24a0672db102008a24b2fbc207a2e489c9797': Add PID and application to Java crash printout
Diffstat (limited to 'core/java')
-rw-r--r--core/java/com/android/internal/os/RuntimeInit.java10
1 files changed, 9 insertions, 1 deletions
diff --git a/core/java/com/android/internal/os/RuntimeInit.java b/core/java/com/android/internal/os/RuntimeInit.java
index a85d5fef2a21..5538dca2a4fa 100644
--- a/core/java/com/android/internal/os/RuntimeInit.java
+++ b/core/java/com/android/internal/os/RuntimeInit.java
@@ -17,6 +17,7 @@
package com.android.internal.os;
import android.app.ActivityManagerNative;
+import android.app.ActivityThread;
import android.app.ApplicationErrorReport;
import android.os.Build;
import android.os.Debug;
@@ -69,7 +70,14 @@ public class RuntimeInit {
if (mApplicationObject == null) {
Slog.e(TAG, "*** FATAL EXCEPTION IN SYSTEM PROCESS: " + t.getName(), e);
} else {
- Slog.e(TAG, "FATAL EXCEPTION: " + t.getName(), e);
+ StringBuilder message = new StringBuilder();
+ message.append("FATAL EXCEPTION: ").append(t.getName()).append("\n");
+ final String processName = ActivityThread.currentProcessName();
+ if (processName != null) {
+ message.append("Process: ").append(processName).append(", ");
+ }
+ message.append("PID: ").append(Process.myPid());
+ Slog.e(TAG, message.toString(), e);
}
// Bring up crash dialog, wait for it to be dismissed