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

Merge "Update the method about foreground time." into oc-dr1-dev

Browse Source 
am: 96e774b7d7

Change-Id: I4037f224cf5028abe5617775d394adfed1552b27
This commit is contained in:
jackqdyulei
2017-07-05 20:42:10 +00:00
committed by android-build-merger
parent 593049c1d4 96e774b7d7
commit b067dea683
3 changed files with 29 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -122,7 +122,10 @@ public class BatteryUtils {
}
Log.v(TAG, "foreground time(us): " + timeUs);
return convertUsToMs(timeUs);
// Return the min value of STATE_TOP time and foreground activity time, since both of these
// time have some errors.
return convertUsToMs(
Math.min(timeUs, getForegroundActivityTotalTimeUs(uid, rawRealTimeUs)));
}
/**
@@ -167,15 +170,13 @@ public class BatteryUtils {
*/
@VisibleForTesting
void smearScreenBatterySipper(List<BatterySipper> sippers, BatterySipper screenSipper) {
final long rawRealtimeMs = SystemClock.elapsedRealtime();
long totalActivityTimeMs = 0;
final SparseLongArray activityTimeArray = new SparseLongArray();
for (int i = 0, size = sippers.size(); i < size; i++) {
final BatteryStats.Uid uid = sippers.get(i).uidObj;
if (uid != null) {
final long timeMs = Math.min(getForegroundActivityTotalTimeMs(uid, rawRealtimeMs),
getProcessTimeMs(StatusType.FOREGROUND, uid,
BatteryStats.STATS_SINCE_CHARGED));
final long timeMs = getProcessTimeMs(StatusType.FOREGROUND, uid,
BatteryStats.STATS_SINCE_CHARGED);
activityTimeArray.put(uid.getUid(), timeMs);
totalActivityTimeMs += timeMs;
}
@@ -332,11 +333,10 @@ public class BatteryUtils {
}
@VisibleForTesting
long getForegroundActivityTotalTimeMs(BatteryStats.Uid uid, long rawRealtimeMs) {
long getForegroundActivityTotalTimeUs(BatteryStats.Uid uid, long rawRealtimeUs) {
final BatteryStats.Timer timer = uid.getForegroundActivityTimer();
if (timer != null) {
return convertUsToMs(timer.getTotalTimeLocked(convertMsToUs(rawRealtimeMs),
BatteryStats.STATS_SINCE_CHARGED));
return timer.getTotalTimeLocked(rawRealtimeUs, BatteryStats.STATS_SINCE_CHARGED);
}
return 0;