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

Commit b793470e authored by Songchun Fan's avatar Songchun Fan Committed by Automerger Merge Worker
Browse files

Merge "[metrics] log TotalDelayedReadsDurationMillis during ANR and Crash"... 

Merge "[metrics] log TotalDelayedReadsDurationMillis during ANR and Crash" into sc-dev am: 27d6aa2e

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

Change-Id: I81924703609e2e1a2b41191a054e0a5dcc274a80
parents 399f3da3 27d6aa2e

core/java/android/os/incremental/IncrementalMetrics.java

+1 −1
Original line number Diff line number Diff line
@@ -90,7 +90,7 @@ public class IncrementalMetrics { 
     * @return total duration in milliseconds of delayed reads

     */

    public long getTotalDelayedReadsDurationMillis() {

        return mData.getInt(IIncrementalService.METRICS_TOTAL_DELAYED_READS_MILLIS, -1);

        return mData.getLong(IIncrementalService.METRICS_TOTAL_DELAYED_READS_MILLIS, -1);

    }



    /**

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

+3 −1
Original line number Diff line number Diff line
@@ -7842,7 +7842,9 @@ public class ActivityManagerService extends IActivityManager.Stub 
                incrementalMetrics != null ? incrementalMetrics.getMillisSinceLastReadError()

                        : -1,

                incrementalMetrics != null ? incrementalMetrics.getLastReadErrorNumber()

                        : 0

                        : 0,

                incrementalMetrics != null ? incrementalMetrics.getTotalDelayedReadsDurationMillis()

                        : -1

        );















        final int relaunchReason = r == null ? RELAUNCH_REASON_NONE

































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



+3
−1




























Original line number
Diff line number
Diff line








@@ -470,7 +470,9 @@ class ProcessErrorStateRecord {













                incrementalMetrics != null ? incrementalMetrics.getMillisSinceLastReadError()















                        : -1,















                incrementalMetrics != null ? incrementalMetrics.getLastReadErrorNumber()













                        : 0);













                        : 0,













                incrementalMetrics != null ? incrementalMetrics.getTotalDelayedReadsDurationMillis()













                        : -1);















        final ProcessRecord parentPr = parentProcess != null















                ? (ProcessRecord) parentProcess.mOwner : null;















        mService.addErrorToDropBox("anr", mApp, mApp.processName, activityShortComponentName,