472367a9ba2102aa15bec2978e6a800d0df7877e - platform_frameworks_base

commit	472367a9ba2102aa15bec2978e6a800d0df7877e	[log] [tgz]
author	Dmitri Plotnikov <dplotnikov@google.com>	Mon Dec 12 18:26:26 2022 -0800
committer	Dmitri Plotnikov <dplotnikov@google.com>	Mon Dec 19 15:19:17 2022 -0800
tree	8bc7b1ea1af677a0b17e34310d512501aeec05df
parent	d70ac512e92d8f16f205c44fff1b0cabe99f2a1a [diff]

Rename MeasuredEnergy to EnergyConsumer

Bug: 256945119
Test: atest FrameworksServicesTests:BatteryStatsTests

Change-Id: I0e10a3bd0bfffcb55658c09dd57a0888d9efb462

core/java/android/os/BatteryConsumer.java[diff]
core/java/android/os/BatteryStats.java[diff]
core/java/com/android/internal/os/BatteryStatsHistory.java[diff]
core/java/com/android/internal/os/BatteryStatsHistoryIterator.java[diff]
core/java/com/android/internal/power/EnergyConsumerStats.java[Renamed from core/java/com/android/internal/power/MeasuredEnergyStats.java - diff]
core/tests/batterystatstests/BatteryStatsViewer/res/drawable/gm_amp_24.xml[Deleted - diff]
core/tests/batterystatstests/BatteryStatsViewer/res/drawable/gm_energy_24.xml[Renamed from core/tests/batterystatstests/BatteryStatsViewer/res/drawable/gm_custom_24.xml - diff]
core/tests/batterystatstests/BatteryStatsViewer/res/values/colors.xml[diff]
core/tests/batterystatstests/BatteryStatsViewer/src/com/android/frameworks/core/batterystatsviewer/BatteryConsumerData.java[diff]
core/tests/batterystatstests/BatteryStatsViewer/src/com/android/frameworks/core/batterystatsviewer/BatteryStatsViewerActivity.java[diff]
core/tests/batterystatstests/BatteryUsageStatsProtoTests/src/com/android/internal/os/BatteryUsageStatsPulledTest.java[diff]
core/tests/coretests/src/com/android/internal/os/BatteryStatsTests.java[diff]
core/tests/coretests/src/com/android/internal/power/EnergyConsumerStatsTest.java[Renamed from core/tests/coretests/src/com/android/internal/power/MeasuredEnergyStatsTest.java - diff]
services/core/java/com/android/server/am/BatteryStatsService.java[diff]
services/core/java/com/android/server/power/stats/AmbientDisplayPowerCalculator.java[diff]
services/core/java/com/android/server/power/stats/BatteryExternalStatsWorker.java[diff]
services/core/java/com/android/server/power/stats/BatteryStatsImpl.java[diff]
services/core/java/com/android/server/power/stats/BatteryUsageStatsProvider.java[diff]
services/core/java/com/android/server/power/stats/BluetoothPowerCalculator.java[diff]
services/core/java/com/android/server/power/stats/CpuPowerCalculator.java[diff]
services/core/java/com/android/server/power/stats/CustomEnergyConsumerPowerCalculator.java[Renamed from services/core/java/com/android/server/power/stats/CustomMeasuredPowerCalculator.java - diff]
services/core/java/com/android/server/power/stats/EnergyConsumerSnapshot.java[Renamed from services/core/java/com/android/server/power/stats/MeasuredEnergySnapshot.java - diff]
services/core/java/com/android/server/power/stats/GnssPowerCalculator.java[diff]
services/core/java/com/android/server/power/stats/MobileRadioPowerCalculator.java[diff]
services/core/java/com/android/server/power/stats/PowerCalculator.java[diff]
services/core/java/com/android/server/power/stats/ScreenPowerCalculator.java[diff]
services/core/java/com/android/server/power/stats/SystemServicePowerCalculator.java[diff]
services/core/java/com/android/server/power/stats/WifiPowerCalculator.java[diff]
services/tests/servicestests/src/com/android/server/power/stats/AmbientDisplayPowerCalculatorTest.java[diff]
services/tests/servicestests/src/com/android/server/power/stats/BatteryExternalStatsWorkerTest.java[diff]
services/tests/servicestests/src/com/android/server/power/stats/BatteryStatsHistoryTest.java[diff]
services/tests/servicestests/src/com/android/server/power/stats/BatteryStatsNoteTest.java[diff]
services/tests/servicestests/src/com/android/server/power/stats/BatteryStatsTests.java[diff]
services/tests/servicestests/src/com/android/server/power/stats/BatteryUsageStatsRule.java[diff]
services/tests/servicestests/src/com/android/server/power/stats/BatteryUsageStatsTest.java[diff]
services/tests/servicestests/src/com/android/server/power/stats/BluetoothPowerCalculatorTest.java[diff]
services/tests/servicestests/src/com/android/server/power/stats/CpuPowerCalculatorTest.java[diff]
services/tests/servicestests/src/com/android/server/power/stats/CustomEnergyConsumerPowerCalculatorTest.java[Renamed from services/tests/servicestests/src/com/android/server/power/stats/CustomMeasuredPowerCalculatorTest.java - diff]
services/tests/servicestests/src/com/android/server/power/stats/EnergyConsumerSnapshotTest.java[Renamed from services/tests/servicestests/src/com/android/server/power/stats/MeasuredEnergySnapshotTest.java - diff]
services/tests/servicestests/src/com/android/server/power/stats/GnssPowerCalculatorTest.java[diff]
services/tests/servicestests/src/com/android/server/power/stats/MobileRadioPowerCalculatorTest.java[diff]
services/tests/servicestests/src/com/android/server/power/stats/MockBatteryStatsImpl.java[diff]
services/tests/servicestests/src/com/android/server/power/stats/ScreenPowerCalculatorTest.java[diff]
services/tests/servicestests/src/com/android/server/power/stats/SystemServicePowerCalculatorTest.java[diff]
services/tests/servicestests/src/com/android/server/power/stats/WifiPowerCalculatorTest.java[diff]

45 files changed