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

Commit 1db3ba61 authored by Elliott Hughes's avatar Elliott Hughes Committed by Automerger Merge Worker
Browse files

Merge "[BugFix][Batterystats] bugfix for noteResetVideoLocked" am: 5c370458 am: 1b6c142a 

Change-Id: I16df2df6bad72b43d924e8af3a07ce2f599d1aac
parents c24f011f 1b6c142a

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