95bd56660ef231026e63f9fa6f6e55a63bc1d2e6 - platform_frameworks_base

commit	95bd56660ef231026e63f9fa6f6e55a63bc1d2e6	[log] [tgz]
author	Michael Wachenschwanz <mwachens@google.com>	Tue Feb 16 18:39:27 2021 -0800
committer	Michael Wachenschwanz <mwachens@google.com>	Wed Mar 03 16:20:39 2021 -0800
tree	0c25c230f158847173820a3fb40bb19097ab86b4
parent	542c1fecf5677b677dd1727b1f07cc9f3343cf93 [diff]

Accumulate and attribute measured Cpu energy in BatteryStats

BatteryExternalStatsWorker will now include measured Cpu Cluster energy
data (if available) when triggering a Cpu update in BatteryStatsImpl.
Using the per cluster per uid duration read from the kernel, the
measured energy can be attributed per cluster and then totaled to get
the Cpu energy consumption of a uid since the last update.

Fixes: 180079165
Test: manual ("adb shell dumpsys batterystats --measured-energy" on an
unplugged PowerStatsHal2.0 enabled device)

Change-Id: I0127bf61decdd5a9a5744e3352d5a3ff3a5fa2fe

core/java/com/android/internal/os/BatteryStatsImpl.java[diff]
core/java/com/android/internal/power/MeasuredEnergyStats.java[diff]
core/tests/coretests/src/com/android/internal/os/BatteryStatsCpuTimesTest.java[diff]
core/tests/coretests/src/com/android/internal/os/CpuPowerCalculatorTest.java[diff]
core/tests/coretests/src/com/android/internal/os/SystemServicePowerCalculatorTest.java[diff]
services/core/java/com/android/server/am/BatteryExternalStatsWorker.java[diff]
services/core/java/com/android/server/am/MeasuredEnergySnapshot.java[diff]

7 files changed