summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Elliott Hughes <enh@google.com> 2020-03-17 23:11:57 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2020-03-17 23:11:57 +0000
commit5c3704583fc1e03d7bd0a4c608d69b757fb9fd26 (patch)
treebaf58c9d9149ed405107a3abfc980acbf3489e91
parentb375f0bd4aff3d0834bbec7279942beca06ac0de (diff)
parent03aaa9625e6cc270201d2ddc24d11b2da2bd6263 (diff)
Merge "[BugFix][Batterystats] bugfix for noteResetVideoLocked"
-rw-r--r--core/java/com/android/internal/os/BatteryStatsImpl.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/com/android/internal/os/BatteryStatsImpl.java b/core/java/com/android/internal/os/BatteryStatsImpl.java
index 5d50582517a3..401933aa4b1f 100644
--- a/core/java/com/android/internal/os/BatteryStatsImpl.java
+++ b/core/java/com/android/internal/os/BatteryStatsImpl.java
@@ -5421,7 +5421,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));