am 649da9b5: am 5a47a9f6: Merge "Native Runtime: Add LOG_ID_CRASH" (b90e504e) · Commits · e / os / android_frameworks_base

core/java/android/util/Log.java

+1 −0

Original line number	Diff line number	Diff line
		@@ -352,6 +352,7 @@ public final class Log {
		/** @hide */ public static final int LOG_ID_RADIO = 1;
		/** @hide */ public static final int LOG_ID_EVENTS = 2;
		/** @hide */ public static final int LOG_ID_SYSTEM = 3;
		/** @hide */ public static final int LOG_ID_CRASH = 4;

		/** @hide */ public static native int println_native(int bufID,
		int priority, String tag, String msg);

core/java/com/android/internal/os/RuntimeInit.java

+9 −4

Original line number	Diff line number	Diff line
		@@ -55,6 +55,11 @@ public class RuntimeInit {
		private static final native void nativeFinishInit();
		private static final native void nativeSetExitWithoutCleanup(boolean exitWithoutCleanup);

		private static int Clog_e(String tag, String msg, Throwable tr) {
		return Log.println_native(Log.LOG_ID_CRASH, Log.ERROR, tag,
		msg + '\n' + Log.getStackTraceString(tr));
		}

		/**
		* Use this to log a message when a thread exits due to an uncaught
		* exception. The framework catches these for the main threads, so
		@@ -68,7 +73,7 @@ public class RuntimeInit {
		mCrashing = true;

		if (mApplicationObject == null) {
		Slog.e(TAG, "*** FATAL EXCEPTION IN SYSTEM PROCESS: " + t.getName(), e);
		Clog_e(TAG, "*** FATAL EXCEPTION IN SYSTEM PROCESS: " + t.getName(), e);
		} else {
		StringBuilder message = new StringBuilder();
		message.append("FATAL EXCEPTION: ").append(t.getName()).append("\n");
		@@ -77,7 +82,7 @@ public class RuntimeInit {
		message.append("Process: ").append(processName).append(", ");
		}
		message.append("PID: ").append(Process.myPid());
		Slog.e(TAG, message.toString(), e);
		Clog_e(TAG, message.toString(), e);
		}

		// Bring up crash dialog, wait for it to be dismissed
		@@ -85,9 +90,9 @@ public class RuntimeInit {
		mApplicationObject, new ApplicationErrorReport.CrashInfo(e));
		} catch (Throwable t2) {
		try {
		Slog.e(TAG, "Error reporting crash", t2);
		Clog_e(TAG, "Error reporting crash", t2);
		} catch (Throwable t3) {
		// Even Slog.e() fails! Oh well.
		// Even Clog_e() fails! Oh well.
		}
		} finally {
		// Try everything to make sure this process goes away.