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

Merge "Skip STATE_SERVICE_RESTARTING while dumping procstats to statsd" into sc-dev

Browse Source
This commit is contained in:
Jing Ji
2021-05-06 00:18:53 +00:00
committed by Android (Google) Code Review
parent 3afe697d94 ec65308e4b
commit 90381205cc
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/java/com/android/internal/app/procstats/DumpUtils.java
View File

@@ -93,7 +93,6 @@ public final class DumpUtils {
STATE_LABELS[STATE_BOUND_TOP_OR_FGS] = "Bnd TopFgs";
STATE_LABELS[STATE_FGS] = " Fgs";
STATE_LABELS[STATE_IMPORTANT_FOREGROUND] = " Imp Fg";
STATE_LABELS[STATE_IMPORTANT_FOREGROUND] = " Imp Fg";
STATE_LABELS[STATE_IMPORTANT_BACKGROUND] = " Imp Bg";
STATE_LABELS[STATE_BACKUP] = " Backup";
STATE_LABELS[STATE_SERVICE] = " Service";

8
core/java/com/android/internal/app/procstats/ProcessState.java
View File

@@ -1550,6 +1550,10 @@ public final class ProcessState {
final int key = mDurations.getKeyAt(i);
final int type = SparseMappingTable.getIdFromKey(key);
final int aggregatedType = DumpUtils.aggregateCurrentProcessState(type);
if ((type % STATE_COUNT) == STATE_SERVICE_RESTARTING) {
// Skip restarting service state -- that is not actually a running process.
continue;
}
long time = mDurations.getValue(key);
if (mCurCombinedState == type) {
@@ -1563,7 +1567,9 @@ public final class ProcessState {
durationByState.put(aggregatedType, time);
}
}
if (!didCurState && mCurCombinedState != STATE_NOTHING) {
if (!didCurState && mCurCombinedState != STATE_NOTHING
&& (mCurCombinedState % STATE_COUNT) != STATE_SERVICE_RESTARTING) {
// Skip restarting service state -- that is not actually a running process.
final int aggregatedType = DumpUtils.aggregateCurrentProcessState(mCurCombinedState);
int index = durationByState.indexOfKey(aggregatedType);
if (index >= 0) {