Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9f704778 authored by Bookatz's avatar Bookatz Committed by android-build-merger
Browse files

Merge changes from topic 'wakelockTotalDuration' into oc-dev am: 6b1989c7 

am: 6103e044

Change-Id: I5dcff27685fa96f6cdc0159ee454720c9d5e1e01
parents cfb2ea8b 6103e044

core/java/android/os/BatteryStats.java

+3 −3
Original line number Diff line number Diff line
@@ -2756,9 +2756,9 @@ public abstract class BatteryStats implements Parcelable { 
            long elapsedRealtimeUs, String name, int which, String linePrefix) {

        long totalTimeMicros = 0;

        int count = 0;

        long max = -1;

        long current = -1;

        long totalDuration = -1;

        long max = 0;

        long current = 0;

        long totalDuration = 0;

        if (timer != null) {

            totalTimeMicros = timer.getTotalTimeLocked(elapsedRealtimeUs, which);

            count = timer.getCountLocked(which);