80c0c66edce9bcc179339a4b0542d5764f3225ba - platform_frameworks_base

commit	80c0c66edce9bcc179339a4b0542d5764f3225ba	[log] [tgz]
author	Dmitri Plotnikov <dplotnikov@google.com>	Wed Feb 03 16:15:05 2021 -0800
committer	Dmitri Plotnikov <dplotnikov@google.com>	Mon Feb 22 11:35:14 2021 -0800
tree	2a1489db90effdf7ae0c1a46481f8089db28d5ed
parent	92e23aa512186ead1c3d848d10605d940c4f3a2c [diff]

Convert WifiPowerCalculator to work with BatteryUsageStats

Also, combine WifePowerCalculator and WifiPowerEstimator: they
have a lot more in common than different.

Bug: 158137862
Test: atest WifiPowerCalculatorTest

Change-Id: Ib937102043a1fe04941ecfd09b5077b14058e6ef

core/java/android/os/BatteryConsumer.java[diff]
core/java/com/android/internal/os/UsageBasedPowerEstimator.java[diff]
core/java/com/android/internal/os/WifiPowerCalculator.java[diff]
core/java/com/android/internal/os/WifiPowerEstimator.java[Deleted - diff]
core/tests/coretests/src/com/android/internal/os/BatteryStatsTests.java[diff]
core/tests/coretests/src/com/android/internal/os/WifiPowerCalculatorTest.java[Added - diff]

6 files changed