a84c096ad965ad85e2f9a0f5d5ce1eef00163a31 - platform_frameworks_base

commit	a84c096ad965ad85e2f9a0f5d5ce1eef00163a31	[log] [tgz]
author	Dmitri Plotnikov <dplotnikov@google.com>	Fri Feb 05 19:13:47 2021 -0800
committer	Dmitri Plotnikov <dplotnikov@google.com>	Tue Feb 09 19:27:47 2021 -0800
tree	30c3233d1198c393d5585b01dc4255c90c6b8035
parent	4db015d00ed1b2f2f96f9a2bea4449c0680c37dd [diff]

Make ScreenPowerCalculator use measured energy with BatteryUsageStats

Test: atest FrameworksCoreTests:com.android.internal.os.ScreenPowerCalculatorTest

Bug: 158137862
Bug: 178140704
Change-Id: I8066e0712db88a8825dc973d9efa45fdf70a2ef5

core/java/android/os/BatteryConsumer.java[diff]
core/java/android/os/UidBatteryConsumer.java[diff]
core/java/com/android/internal/os/AmbientDisplayPowerCalculator.java[diff]
core/java/com/android/internal/os/PowerCalculator.java[diff]
core/java/com/android/internal/os/ScreenPowerCalculator.java[diff]
core/tests/coretests/src/com/android/internal/os/BatteryStatsHelperTest.java[diff]
core/tests/coretests/src/com/android/internal/os/ScreenPowerCalculatorTest.java[diff]

7 files changed