Merge "[am] add place holders for new crash stats fields" into sc-dev (39bcc47c) · Commits · e / os / android_frameworks_base

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

+11 −1

Original line number	Diff line number	Diff line
		@@ -7775,7 +7775,17 @@ public class ActivityManagerService extends IActivityManager.Stub
		: ServerProtoEnums.ERROR_SOURCE_UNKNOWN,
		incrementalMetrics != null /* isIncremental */, loadingProgress,
		incrementalMetrics != null ? incrementalMetrics.getMillisSinceOldestPendingRead()
		: -1
		: -1,
		0 /* storage_health_code */,
		0 /* data_loader_status_code */,
		false /* read_logs_enabled */,
		0 /* millis_since_last_data_loader_bind */,
		0 /* data_loader_bind_delay_millis */,
		0 /* total_delayed_reads */,
		0 /* total_failed_reads */,
		0 /* last_read_error_uid */,
		0 /* last_read_error_millis_since */,
		0 /* last_read_error_code */
		);

		final int relaunchReason = r == null ? RELAUNCH_REASON_NONE

+11 −1

Original line number	Diff line number	Diff line
		@@ -432,7 +432,17 @@ class ProcessErrorStateRecord {
		(mApp.info != null) ? mApp.info.packageName : "",
		incrementalMetrics != null /* isIncremental */, loadingProgress,
		incrementalMetrics != null ? incrementalMetrics.getMillisSinceOldestPendingRead()
		: -1);
		: -1,
		0 /* storage_health_code */,
		0 /* data_loader_status_code */,
		false /* read_logs_enabled */,
		0 /* millis_since_last_data_loader_bind */,
		0 /* data_loader_bind_delay_millis */,
		0 /* total_delayed_reads */,
		0 /* total_failed_reads */,
		0 /* last_read_error_uid */,
		0 /* last_read_error_millis_since */,
		0 /* last_read_error_code */);
		final ProcessRecord parentPr = parentProcess != null
		? (ProcessRecord) parentProcess.mOwner : null;
		mService.addErrorToDropBox("anr", mApp, mApp.processName, activityShortComponentName,