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

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

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

Change-Id: I2330d558ab54536251c8121eddf113484774f63b
This commit is contained in:
Songchun Fan
2021-06-08 16:27:35 +00:00
committed by Automerger Merge Worker
parent 116bc11f11 27d6aa2ec4
commit 4843872004
3 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/os/incremental/IncrementalMetrics.java
View File

@@ -90,7 +90,7 @@ public class IncrementalMetrics {
* @return total duration in milliseconds of delayed reads * @return total duration in milliseconds of delayed reads
*/ */
public long getTotalDelayedReadsDurationMillis() { public long getTotalDelayedReadsDurationMillis() {
return mData.getInt(IIncrementalService.METRICS_TOTAL_DELAYED_READS_MILLIS, -1); return mData.getLong(IIncrementalService.METRICS_TOTAL_DELAYED_READS_MILLIS, -1);
} }
/** /**

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

@@ -7848,7 +7848,9 @@ public class ActivityManagerService extends IActivityManager.Stub
incrementalMetrics != null ? incrementalMetrics.getMillisSinceLastReadError() incrementalMetrics != null ? incrementalMetrics.getMillisSinceLastReadError()
: -1, : -1,
incrementalMetrics != null ? incrementalMetrics.getLastReadErrorNumber() incrementalMetrics != null ? incrementalMetrics.getLastReadErrorNumber()
: 0 : 0,
incrementalMetrics != null ? incrementalMetrics.getTotalDelayedReadsDurationMillis()
: -1
); );
final int relaunchReason = r == null ? RELAUNCH_REASON_NONE final int relaunchReason = r == null ? RELAUNCH_REASON_NONE

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

@@ -470,7 +470,9 @@ class ProcessErrorStateRecord {
incrementalMetrics != null ? incrementalMetrics.getMillisSinceLastReadError() incrementalMetrics != null ? incrementalMetrics.getMillisSinceLastReadError()
: -1, : -1,
incrementalMetrics != null ? incrementalMetrics.getLastReadErrorNumber() incrementalMetrics != null ? incrementalMetrics.getLastReadErrorNumber()
: 0); : 0,
incrementalMetrics != null ? incrementalMetrics.getTotalDelayedReadsDurationMillis()
: -1);
final ProcessRecord parentPr = parentProcess != null final ProcessRecord parentPr = parentProcess != null
? (ProcessRecord) parentProcess.mOwner : null; ? (ProcessRecord) parentProcess.mOwner : null;
mService.addErrorToDropBox("anr", mApp, mApp.processName, activityShortComponentName, mService.addErrorToDropBox("anr", mApp, mApp.processName, activityShortComponentName,