Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3154bb65 authored by Jing Ji's avatar Jing Ji Committed by Automerger Merge Worker
Browse files

Merge "Reset common association source while resetting procstats associations"... 

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

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

Change-Id: I9d4d0cf65bbb831e441405bd6a02b15dfd57ea5a
parents caa9b99f dec2e216

core/java/com/android/internal/app/procstats/AssociationState.java

+9 −0
Original line number Diff line number Diff line
@@ -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) {