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

Commit 84a074db 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 am: 3154bb65

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

Change-Id: I196a7cb607ab90529db044ba1ea7ca12452d1cdb
parents 9d227d66 3154bb65

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) {