From 96906f72e38c37f25d124c16f6943934851bb454 Mon Sep 17 00:00:00 2001
From: Michael Wachenschwanz <mwachens@google.com>
Date: Wed, 12 May 2021 16:19:02 -0700
Subject: [PATCH] Fix BatteryStats Screen On timer reset

StopwatchTimer reset uses elapsedRealtime not uptime

Bug: 187844042
Test: builds + boots
Change-Id: I82286d74fef6256971361e70a787a2b39a7cbba4
---
 core/java/com/android/internal/os/BatteryStatsImpl.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/java/com/android/internal/os/BatteryStatsImpl.java b/core/java/com/android/internal/os/BatteryStatsImpl.java
index db67bab25e786..56f81e240e868 100644
--- a/core/java/com/android/internal/os/BatteryStatsImpl.java
+++ b/core/java/com/android/internal/os/BatteryStatsImpl.java
@@ -11194,7 +11194,7 @@ public class BatteryStatsImpl extends BatteryStats {
         final long elapsedRealtimeUs = elapsedRealtimeMillis * 1000;
         mStartCount = 0;
         initTimes(uptimeUs, elapsedRealtimeUs);
-        mScreenOnTimer.reset(false, uptimeUs);
+        mScreenOnTimer.reset(false, elapsedRealtimeUs);
         mScreenDozeTimer.reset(false, elapsedRealtimeUs);
         for (int i=0; i<NUM_SCREEN_BRIGHTNESS_BINS; i++) {
             mScreenBrightnessTimer[i].reset(false, elapsedRealtimeUs);