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

Merge "[am] add place holders for new crash stats fields" into sc-dev

Browse Source
This commit is contained in:
Songchun Fan
2021-04-26 21:36:56 +00:00
committed by Android (Google) Code Review
parent c9fcf22f2b 2ee0270cba
commit 39bcc47cee
2 changed files with 22 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

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