Merge "[BugFix][Batterystats] bugfix for noteResetVideoLocked" am: 5c3704583f

Change-Id: I3e3d6680bbd0e7c9961c08704412372db2e7868b
This commit is contained in:
Elliott Hughes
2020-03-17 23:21:07 +00:00
committed by Automerger Merge Worker

View File

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