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

am 87a79c39: Merge "BatteryStatsHelper: Fix some lost power" into mnc-dev

Browse Source 
* commit '87a79c394dcecd28c3811615ce975abcde185255':
  BatteryStatsHelper: Fix some lost power
This commit is contained in:
Adam Lesinski
2015-06-12 23:27:42 +00:00
committed by Android Git Automerger
parent bc91d5946a 87a79c394d
commit c32eec3790
2 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3541,8 +3541,15 @@ public abstract class BatteryStats implements Parcelable {
} }
printmAh(pw, bs.totalPowerMah); printmAh(pw, bs.totalPowerMah);
if (bs.drainType == BatterySipper.DrainType.APP) { if (bs.usagePowerMah != bs.totalPowerMah) {
// If the usage (generic power) isn't the whole amount, we list out
// what components are involved in the calculation.
pw.print(" ("); pw.print(" (");
if (bs.usagePowerMah != 0) {
pw.print(" usage=");
printmAh(pw, bs.usagePowerMah);
}
if (bs.cpuPowerMah != 0) { if (bs.cpuPowerMah != 0) {
pw.print(" cpu="); pw.print(" cpu=");
printmAh(pw, bs.cpuPowerMah); printmAh(pw, bs.cpuPowerMah);

11
core/java/com/android/internal/os/BatteryStatsHelper.java
View File

@@ -587,6 +587,7 @@ public final class BatteryStatsHelper {
bs.add(wbs); bs.add(wbs);
} }
bs.computeMobilemspp(); bs.computeMobilemspp();
bs.sumPower();
} }
private void addIdleUsage() { private void addIdleUsage() {
@@ -612,9 +613,8 @@ public final class BatteryStatsHelper {
private void addWiFiUsage() { private void addWiFiUsage() {
BatterySipper bs = new BatterySipper(DrainType.WIFI, null, 0); BatterySipper bs = new BatterySipper(DrainType.WIFI, null, 0);
mWifiPowerCalculator.calculateRemaining(bs, mStats, mRawRealtime, mRawUptime, mStatsType); mWifiPowerCalculator.calculateRemaining(bs, mStats, mRawRealtime, mRawUptime, mStatsType);
bs.sumPower(); aggregateSippers(bs, mWifiSippers, "WIFI");
if (bs.totalPowerMah > 0 || !mWifiSippers.isEmpty()) { if (bs.totalPowerMah > 0) {
aggregateSippers(bs, mWifiSippers, "WIFI");
mUsageList.add(bs); mUsageList.add(bs);
} }
} }
@@ -627,8 +627,8 @@ public final class BatteryStatsHelper {
BatterySipper bs = new BatterySipper(BatterySipper.DrainType.BLUETOOTH, null, 0); BatterySipper bs = new BatterySipper(BatterySipper.DrainType.BLUETOOTH, null, 0);
mBluetoothPowerCalculator.calculateRemaining(bs, mStats, mRawRealtime, mRawUptime, mBluetoothPowerCalculator.calculateRemaining(bs, mStats, mRawRealtime, mRawUptime,
mStatsType); mStatsType);
if (bs.sumPower() > 0) { aggregateSippers(bs, mBluetoothSippers, "Bluetooth");
aggregateSippers(bs, mBluetoothSippers, "Bluetooth"); if (bs.totalPowerMah > 0) {
mUsageList.add(bs); mUsageList.add(bs);
} }
} }
@@ -639,7 +639,6 @@ public final class BatteryStatsHelper {
BatterySipper bs = new BatterySipper(DrainType.USER, null, 0); BatterySipper bs = new BatterySipper(DrainType.USER, null, 0);
bs.userId = userId; bs.userId = userId;
aggregateSippers(bs, mUserSippers.valueAt(i), "User"); aggregateSippers(bs, mUserSippers.valueAt(i), "User");
bs.sumPower();
mUsageList.add(bs); mUsageList.add(bs);
} }
} }