Merge "Merge "[BugFix][Batterystats] bugfix for noteResetVideoLocked" am: 5c3704583f am: 1b6c142ab5 am: 1db3ba61f8" into rvc-d1-dev-plus-aosp am: 2a3dd196f6

Change-Id: Ie82bc738869e50a7c33f89c124b63ccef34111e3
2020-03-18 00:17:29 +00:00
parent 0dc138bdb2 2a3dd196f6
commit 7b82471cf1
1 changed files with 1 additions and 1 deletions
--- a/core/java/com/android/internal/os/BatteryStatsImpl.java
+++ b/core/java/com/android/internal/os/BatteryStatsImpl.java
@@ -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));