Merge "Reset common association source while resetting procstats associations" into sc-dev

2021-05-21 00:18:14 +00:00
parent c7e659afd0 ea9ed7b0f2
commit dec2e2169e
1 changed files with 9 additions and 0 deletions
--- a/core/java/com/android/internal/app/procstats/AssociationState.java
+++ b/core/java/com/android/internal/app/procstats/AssociationState.java
@@ -322,6 +322,15 @@ public final class AssociationState {
                mActiveDuration = 0;
                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) {