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

Commit 7b82471c authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Merge "[BugFix][Batterystats] bugfix for noteResetVideoLocked" am:... 

Merge "Merge "[BugFix][Batterystats] bugfix for noteResetVideoLocked" am: 5c370458 am: 1b6c142a am: 1db3ba61" into rvc-d1-dev-plus-aosp am: 2a3dd196

Change-Id: Ie82bc738869e50a7c33f89c124b63ccef34111e3
parents 0dc138bd 2a3dd196

core/java/com/android/internal/os/BatteryStatsImpl.java

+1 −1
Original line number Diff line number Diff line
@@ -5428,7 +5428,7 @@ public class BatteryStatsImpl extends BatteryStats { 
        if (mVideoOnNesting > 0) {

            final long elapsedRealtime = mClocks.elapsedRealtime();

            final long uptime = mClocks.uptimeMillis();

            mAudioOnNesting = 0;

            mVideoOnNesting = 0;

            mHistoryCur.states2 &= ~HistoryItem.STATE2_VIDEO_ON_FLAG;

            if (DEBUG_HISTORY) Slog.v(TAG, "Video off to: "

                    + Integer.toHexString(mHistoryCur.states));