Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a82ece06 authored Jun 25, 2021 by Yandry Perez Clemente Committed by Android (Google) Code Review Jun 25, 2021

Merge "Add process name to error id." into sc-dev

parents 7850ca85 7f84f12e

services/core/java/com/android/server/Watchdog.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -676,7 +676,7 @@ public class Watchdog {
		final UUID errorId;
		if (mTraceErrorLogger.isAddErrorIdEnabled()) {
		errorId = mTraceErrorLogger.generateErrorId();
		mTraceErrorLogger.addErrorIdToTrace(errorId);
		mTraceErrorLogger.addErrorIdToTrace("system_server", errorId);
		} else {
		errorId = null;
		}

services/core/java/com/android/server/am/ProcessErrorStateRecord.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -267,7 +267,7 @@ class ProcessErrorStateRecord {

		if (mService.mTraceErrorLogger.isAddErrorIdEnabled()) {
		errorId = mService.mTraceErrorLogger.generateErrorId();
		mService.mTraceErrorLogger.addErrorIdToTrace(errorId);
		mService.mTraceErrorLogger.addErrorIdToTrace(mApp.processName, errorId);
		} else {
		errorId = null;
		}

services/core/java/com/android/server/am/TraceErrorLogger.java

+5 −3

Original line number	Diff line number	Diff line
		@@ -46,10 +46,12 @@ public class TraceErrorLogger {
		* can be uniquely identified. We also add the same id to the dropbox entry of the error, so
		* that we can join the trace and the error server-side.
		*
		* @param processName The process name to include in the error id.
		* @param errorId The unique id with which to tag the trace.
		*/
		public void addErrorIdToTrace(UUID errorId) {
		Trace.traceCounter(Trace.TRACE_TAG_ACTIVITY_MANAGER, COUNTER_PREFIX + errorId.toString(),
		public void addErrorIdToTrace(String processName, UUID errorId) {
		Trace.traceCounter(Trace.TRACE_TAG_ACTIVITY_MANAGER,
		COUNTER_PREFIX + processName + "#" + errorId.toString(),
		PLACEHOLDER_VALUE);
		}
		}