Merge "Change dropbox tag for native crashes." into jb-mr2-dev (3c09715c) · Commits · e / os / android_frameworks_base

services/java/com/android/server/am/ActivityManagerService.java

+3 −3

Original line number	Diff line number	Diff line
		@@ -8350,13 +8350,13 @@ public final class ActivityManagerService extends ActivityManagerNative
		final String processName = app == null ? "system_server"
		: (r == null ? "unknown" : r.processName);

		handleApplicationCrashInner(r, processName, crashInfo);
		handleApplicationCrashInner("crash", r, processName, crashInfo);
		}

		/* Native crash reporting uses this inner version because it needs to be somewhat
		* decoupled from the AM-managed cleanup lifecycle
		*/
		void handleApplicationCrashInner(ProcessRecord r, String processName,
		void handleApplicationCrashInner(String eventType, ProcessRecord r, String processName,
		ApplicationErrorReport.CrashInfo crashInfo) {
		EventLog.writeEvent(EventLogTags.AM_CRASH, Binder.getCallingPid(),
		UserHandle.getUserId(Binder.getCallingUid()), processName,
		@@ -8366,7 +8366,7 @@ public final class ActivityManagerService extends ActivityManagerNative
		crashInfo.throwFileName,
		crashInfo.throwLineNumber);

		addErrorToDropBox("crash", r, processName, null, null, null, null, null, crashInfo);
		addErrorToDropBox(eventType, r, processName, null, null, null, null, null, crashInfo);

		crashApplication(r, crashInfo);
		}

+1 −1

Original line number	Diff line number	Diff line
		@@ -82,7 +82,7 @@ class NativeCrashListener extends Thread {
		ci.stackTrace = mCrashReport;

		if (DEBUG) Slog.v(TAG, "Calling handleApplicationCrash()");
		mAm.handleApplicationCrashInner(mApp, mApp.processName, ci);
		mAm.handleApplicationCrashInner("native_crash", mApp, mApp.processName, ci);
		if (DEBUG) Slog.v(TAG, "<-- handleApplicationCrash() returned");
		} catch (Exception e) {
		Slog.e(TAG, "Unable to report native crash", e);