commit 90902651b1d28ce37c7ea363e883ac4736638390
author Mike Ma <yanmin@google.com> Tue Apr 17 14:07:24 2018 -0700
committer Mike Ma <yanmin@google.com> Tue Apr 17 21:12:56 2018 +0000
tree 5489b06fa9f95f8c2a5c717f07712beb78645ec7
parent d688e7b15dd3ee56da34b146ba5ee0271a2cb6cb

Fix screen on count text dump

dischargeScreenOffCount already includes dischargeScreenDozeCount.
Original code deducted dischargeScreenDozeCount twice. This only affects
text dump in bugreport. Proto and checkin dump are not affected.
Test: manual
Fixes: 78187276

Change-Id: Id93465ca75a4a1078e8f280a38b74b696ec62dd2

core/java/android/os/BatteryStats.java

diff --git a/core/java/android/os/BatteryStats.java b/core/java/android/os/BatteryStats.java
index 1d232bf..0b4b921 100644
--- a/core/java/android/os/BatteryStats.java
+++ b/core/java/android/os/BatteryStats.java
@@ -4447,8 +4447,7 @@
             pw.println(sb.toString());
         }
 
-        final long dischargeScreenOnCount =
-                dischargeCount - dischargeScreenOffCount - dischargeScreenDozeCount;
+        final long dischargeScreenOnCount = dischargeCount - dischargeScreenOffCount;
         if (dischargeScreenOnCount >= 0) {
             sb.setLength(0);
             sb.append(prefix);