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

Merge changes from topic 'battery_smear_move' into oc-dev

Browse Source 
am: 883db32859

Change-Id: Ibb862780286006efb4a4a117f007cc652dac4ce9
This commit is contained in:
Lei Yu
2017-06-09 21:17:14 +00:00
committed by android-build-merger
parent 5047d7bf7f 883db32859
commit 308d0dd03c
1 changed files with 24 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3333,7 +3333,10 @@ public abstract class BatteryStats implements Parcelable {
label = "???";
}
dumpLine(pw, uid, category, POWER_USE_ITEM_DATA, label,
BatteryStatsHelper.makemAh(bs.totalPowerMah));
BatteryStatsHelper.makemAh(bs.totalPowerMah),
bs.shouldHide ? 1 : 0,
BatteryStatsHelper.makemAh(bs.screenPowerMah),
BatteryStatsHelper.makemAh(bs.proportionalSmearMah));
}
}
@@ -4362,6 +4365,26 @@ public abstract class BatteryStats implements Parcelable {
}
pw.print(" )");
}
// If there is additional smearing information, include it.
if (bs.totalSmearedPowerMah != bs.totalPowerMah) {
pw.print(" Including smearing: ");
printmAh(pw, bs.totalSmearedPowerMah);
pw.print(" (");
if (bs.screenPowerMah != 0) {
pw.print(" screen=");
printmAh(pw, bs.screenPowerMah);
}
if (bs.proportionalSmearMah != 0) {
pw.print(" proportional=");
printmAh(pw, bs.proportionalSmearMah);
}
pw.print(" )");
}
if (bs.shouldHide) {
pw.print(" Excluded from smearing");
}
pw.println();
}
pw.println();