Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4c6361fd authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "[am] report new incremental crash/anr metrics" into sc-dev am: d9b50675 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14434264

Change-Id: Ib2e190128551170bf1d7af64d1737bfc7d41a839
parents 7415dd8d d9b50675

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

+19 −10
Original line number Diff line number Diff line
@@ -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

































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



+19
−10




























Original line number
Diff line number
Diff line








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