Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge changes from topic 'wakelockTotalDuration' into oc-dev

Browse Source 
am: 6b1989c7e2

Change-Id: I04a7323ed927ebfad40129166d7e0cc61be7b3af
This commit is contained in:
Bookatz
2017-05-08 18:57:34 +00:00
committed by android-build-merger
parent 6d70b7aa2f 6b1989c7e2
commit 6103e0445f
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/java/android/os/BatteryStats.java
View File

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