Merge "fix misleading FATAL EXCEPTION IN SYSTEM PROCESS log"

am: c0c9f53175

Change-Id: I25f1aad9e04c22e0cd4ffc848a53c30dd740bdac
This commit is contained in:
hansson
2018-02-13 16:31:53 +00:00
committed by android-build-merger

View File

@@ -71,10 +71,11 @@ public class RuntimeInit {
public void uncaughtException(Thread t, Throwable e) {
// Don't re-enter if KillApplicationHandler has already run
if (mCrashing) return;
if (mApplicationObject == null) {
// The "FATAL EXCEPTION" string is still used on Android even though
// apps can set a custom UncaughtExceptionHandler that renders uncaught
// exceptions non-fatal.
// mApplicationObject is null for non-zygote java programs (e.g. "am")
// There are also apps running with the system UID. We don't want the
// first clause in either of these two cases, only for system_server.
if (mApplicationObject == null && (Process.SYSTEM_UID == Process.myUid())) {
Clog_e(TAG, "*** FATAL EXCEPTION IN SYSTEM PROCESS: " + t.getName(), e);
} else {
StringBuilder message = new StringBuilder();