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

Merge "Reset common association source while resetting procstats associations" into sc-dev am: dec2e2169e am: 3154bb657b

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

Change-Id: I196a7cb607ab90529db044ba1ea7ca12452d1cdb
This commit is contained in:
Jing Ji
2021-05-21 00:49:45 +00:00
committed by Automerger Merge Worker
parent 9d227d66c8 3154bb657b
commit 84a074db36
1 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
core/java/com/android/internal/app/procstats/AssociationState.java
View File

@@ -322,6 +322,15 @@ public final class AssociationState {
mActiveDuration = 0; mActiveDuration = 0;
mActiveDurations = null; mActiveDurations = null;
} }
// We're actually resetting the common sources in process state already,
// resetting it here too in case they're out of sync.
if (mAssociationState != null) {
final SourceState commonSource = getCommonSourceState(false);
if (commonSource != null) {
commonSource.resetSafely(now);
mCommonSourceState = null;
}
}
} }
void commitStateTime(long nowUptime) { void commitStateTime(long nowUptime) {