Merge "Fix screen on count text dump" into pi-dev

am: dd61c7e8e7 Change-Id: Ia2072936a3c02516a4f3add73895ee8e291cdc04
2018-04-19 13:29:13 -07:00
parent 48cca289df dd61c7e8e7
commit 7351e73b96
1 changed files with 1 additions and 2 deletions
--- a/core/java/android/os/BatteryStats.java
+++ b/core/java/android/os/BatteryStats.java
@@ -4447,8 +4447,7 @@ public abstract class BatteryStats implements Parcelable {
            pw.println(sb.toString());
        }

-        final long dischargeScreenOnCount =
-                dischargeCount - dischargeScreenOffCount - dischargeScreenDozeCount;
+        final long dischargeScreenOnCount = dischargeCount - dischargeScreenOffCount;
        if (dischargeScreenOnCount >= 0) {
            sb.setLength(0);
            sb.append(prefix);