Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[am] report new incremental crash/anr metrics

Browse Source 
BUG: 184844615
Test: atest android.cts.statsdatom.incremental.AppErrorAtomTests#testAppCrashOnIncremental
Change-Id: Ic429445a4bae47033e2f90c143eaf6fc0ac2c666
This commit is contained in:
Songchun Fan
2021-05-04 20:18:35 -07:00
parent 4bdb297c10
commit 32af550aeb
2 changed files with 38 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
services/core/java/com/android/server/am/ActivityManagerService.java
View File

@@ -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

29
services/core/java/com/android/server/am/ProcessErrorStateRecord.java
View File

@@ -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,