29b15648d13452c428d18e439ab6ec1eb388d4e0 - platform/frameworks/base

commit	29b15648d13452c428d18e439ab6ec1eb388d4e0	[log] [tgz]
author	Adam Bookatz <bookatz@google.com>	Wed Feb 10 18:54:21 2021 -0800
committer	Adam Bookatz <bookatz@google.com>	Thu Feb 11 00:35:32 2021 -0800
tree	7e8d491c2cd7ebd0b835163364d755f31f98ecf0
parent	da600e0c4a43ef1e8d3767f11def8ef07f03deb3 [diff]

CustomMeasuredPowerCalculator

Adds a BatterySipper.customMeasuredPowerMah field to account
for custom energy buckets (i.e. EnergyConsumers of type OTHER)
and adds it to the total accumulated battery drain for each uid.

Bug: 179107328
Bug: 174818228
Test: Manual
Change-Id: Iab9c7ff5f410cd7c4be1ce78dfb2c39d4f783418

core/java/android/os/BatteryStats.java[diff]
core/java/com/android/internal/os/BatterySipper.java[diff]
core/java/com/android/internal/os/BatteryStatsHelper.java[diff]
core/java/com/android/internal/os/BatteryUsageStatsProvider.java[diff]
core/java/com/android/internal/os/CustomMeasuredPowerCalculator.java[Added - diff]

5 files changed