Reset common association source while resetting procstats associations

Bug: 188130785
Bug: 183101565
Bug: 186438656
Test: atest ProcStatsValidationTests
Test: atest ProcessStatsDumpsysTest
Test: atest CtsIncidentHostTestCases:ProcStatsProtoTest
Test: atest CtsStatsdHostTestCases
Change-Id: I0a555c86bc6ba341a6344f28f73faca914d65c3f

1 files changed, 9 insertions, 0 deletions

diff --git a/core/java/com/android/internal/app/procstats/AssociationState.java b/core/java/com/android/internal/app/procstats/AssociationState.java
index 4133c4d41aaa..86a356b47550 100644
--- 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) {