diff options
| author | Dmitri Plotnikov <dplotnikov@google.com> | 2021-05-14 18:43:38 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2021-05-14 18:43:38 +0000 |
| commit | 4d78cddfef259f2c5f878edade461430ead7db65 (patch) | |
| tree | 3ddacf1b0cd589591ea39a17027601a727efb551 /core/java | |
| parent | f7b45b69e579b291307770dc3565acacce32a7de (diff) | |
| parent | 9f08c607f8fae67888313853ce2323099090c6c4 (diff) | |
Merge "Use getUahDischarge when available" into sc-dev
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/com/android/internal/os/BatteryChargeCalculator.java | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/core/java/com/android/internal/os/BatteryChargeCalculator.java b/core/java/com/android/internal/os/BatteryChargeCalculator.java index 0690d1f3fae6..81785298f828 100644 --- a/core/java/com/android/internal/os/BatteryChargeCalculator.java +++ b/core/java/com/android/internal/os/BatteryChargeCalculator.java @@ -63,10 +63,15 @@ public class BatteryChargeCalculator extends PowerCalculator { builder.setChargeTimeRemainingMs(chargeTimeRemainingMs / 1000); } + long dischargeMah = batteryStats.getUahDischarge(BatteryStats.STATS_SINCE_CHARGED) / 1000; + if (dischargeMah == 0) { + dischargeMah = (long) ((dischargedPowerLowerBoundMah + dischargedPowerUpperBoundMah) / 2 + + 0.5); + } + builder.getAggregateBatteryConsumerBuilder( BatteryUsageStats.AGGREGATE_BATTERY_CONSUMER_SCOPE_DEVICE) - .setConsumedPower( - (dischargedPowerLowerBoundMah + dischargedPowerUpperBoundMah) / 2); + .setConsumedPower(dischargeMah); } @Override |