diff options
| author | 2021-05-06 00:02:46 +0000 | |
|---|---|---|
| committer | 2021-05-06 00:02:46 +0000 | |
| commit | d9b50675fde164275a303d2fe6f11cc57b9357d9 (patch) | |
| tree | 029a991237712b2d6caae9d9f78e922bb9fd0019 | |
| parent | f94486117fce311d92e37d38e7a639f8ecc67ad3 (diff) | |
| parent | 32af550aebf33ea9f540c6af86ffb0f2d3941565 (diff) | |
Merge "[am] report new incremental crash/anr metrics" into sc-dev
| -rw-r--r-- | services/core/java/com/android/server/am/ActivityManagerService.java | 29 | ||||
| -rw-r--r-- | services/core/java/com/android/server/am/ProcessErrorStateRecord.java | 29 |
2 files changed, 38 insertions, 20 deletions
diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java index d526ebc8e581..cf0ba7e93d3d 100644 --- a/services/core/java/com/android/server/am/ActivityManagerService.java +++ b/services/core/java/com/android/server/am/ActivityManagerService.java @@ -7777,16 +7777,25 @@ public class ActivityManagerService extends IActivityManager.Stub incrementalMetrics != null /* isIncremental */, loadingProgress, incrementalMetrics != null ? incrementalMetrics.getMillisSinceOldestPendingRead() : -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 */ + incrementalMetrics != null ? incrementalMetrics.getStorageHealthStatusCode() + : -1, + incrementalMetrics != null ? incrementalMetrics.getDataLoaderStatusCode() + : -1, + incrementalMetrics != null && incrementalMetrics.getReadLogsEnabled(), + incrementalMetrics != null ? incrementalMetrics.getMillisSinceLastDataLoaderBind() + : -1, + incrementalMetrics != null ? incrementalMetrics.getDataLoaderBindDelayMillis() + : -1, + incrementalMetrics != null ? incrementalMetrics.getTotalDelayedReads() + : -1, + incrementalMetrics != null ? incrementalMetrics.getTotalFailedReads() + : -1, + incrementalMetrics != null ? incrementalMetrics.getLastReadErrorUid() + : -1, + incrementalMetrics != null ? incrementalMetrics.getMillisSinceLastReadError() + : -1, + incrementalMetrics != null ? incrementalMetrics.getLastReadErrorNumber() + : 0 ); 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 c1b2a9c1987a..5a7e14a6907a 100644 --- a/services/core/java/com/android/server/am/ProcessErrorStateRecord.java +++ b/services/core/java/com/android/server/am/ProcessErrorStateRecord.java @@ -433,16 +433,25 @@ class ProcessErrorStateRecord { incrementalMetrics != null /* isIncremental */, loadingProgress, incrementalMetrics != null ? incrementalMetrics.getMillisSinceOldestPendingRead() : -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 */); + incrementalMetrics != null ? incrementalMetrics.getStorageHealthStatusCode() + : -1, + incrementalMetrics != null ? incrementalMetrics.getDataLoaderStatusCode() + : -1, + incrementalMetrics != null && incrementalMetrics.getReadLogsEnabled(), + incrementalMetrics != null ? incrementalMetrics.getMillisSinceLastDataLoaderBind() + : -1, + incrementalMetrics != null ? incrementalMetrics.getDataLoaderBindDelayMillis() + : -1, + incrementalMetrics != null ? incrementalMetrics.getTotalDelayedReads() + : -1, + incrementalMetrics != null ? incrementalMetrics.getTotalFailedReads() + : -1, + incrementalMetrics != null ? incrementalMetrics.getLastReadErrorUid() + : -1, + incrementalMetrics != null ? incrementalMetrics.getMillisSinceLastReadError() + : -1, + incrementalMetrics != null ? incrementalMetrics.getLastReadErrorNumber() + : 0); final ProcessRecord parentPr = parentProcess != null ? (ProcessRecord) parentProcess.mOwner : null; mService.addErrorToDropBox("anr", mApp, mApp.processName, activityShortComponentName, |