PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix the getForegroundActivityTotalTimeMs" into oc-dr1-dev am: 451b7edfd7

Browse Source 
am: d3f035af0a

Change-Id: If1a3d3b931130efa18014538bc95c2d9ac41d410
This commit is contained in:
Lei Yu
2017-06-28 17:57:46 +00:00
committed by android-build-merger
parent 8072ff4220 d3f035af0a
commit 95a0bd4ca2
2 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/com/android/settings/fuelgauge/BatteryUtils.java
View File

@@ -330,7 +330,8 @@ public class BatteryUtils {
long getForegroundActivityTotalTimeMs(BatteryStats.Uid uid, long rawRealtimeMs) {
final BatteryStats.Timer timer = uid.getForegroundActivityTimer();
if (timer != null) {
return timer.getTotalTimeLocked(rawRealtimeMs, BatteryStats.STATS_SINCE_CHARGED);
return convertUsToMs(
timer.getTotalTimeLocked(rawRealtimeMs, BatteryStats.STATS_SINCE_CHARGED));
}
return 0;