From 2ee0270cbade5a723253ed88e2245bdb80426e2d Mon Sep 17 00:00:00 2001 From: Songchun Fan Date: Wed, 21 Apr 2021 17:49:09 -0700 Subject: [PATCH] [am] add place holders for new crash stats fields Putting empty values for now to cope with proto changes. Will replace the place holders with real values in follow-up CLs. BUG: 184844615 Test: atest android.cts.statsdatom.incremental.AppErrorAtomTests Change-Id: I5a6adcf91c67f331a43e76ee706fdb5f2ffe67d6 --- .../android/server/am/ActivityManagerService.java | 12 +++++++++++- .../android/server/am/ProcessErrorStateRecord.java | 12 +++++++++++- 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java index e202511976439..3c2702de75d5e 100644 --- a/services/core/java/com/android/server/am/ActivityManagerService.java +++ b/services/core/java/com/android/server/am/ActivityManagerService.java @@ -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 diff --git a/services/core/java/com/android/server/am/ProcessErrorStateRecord.java b/services/core/java/com/android/server/am/ProcessErrorStateRecord.java index 6ff3bf652e3cf..167ed864fbcdf 100644 --- a/services/core/java/com/android/server/am/ProcessErrorStateRecord.java +++ b/services/core/java/com/android/server/am/ProcessErrorStateRecord.java @@ -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,