24a7666818f3f6afbef351748f71a452e99c1956 - platform_frameworks_base

commit	24a7666818f3f6afbef351748f71a452e99c1956	[log] [tgz]
author	Dmitri Plotnikov <dplotnikov@google.com>	Mon Dec 11 09:55:33 2023 -0800
committer	Dmitri Plotnikov <dplotnikov@google.com>	Wed Dec 13 21:12:38 2023 -0800
tree	fc013cfc01ae2d1bb2d1a0d13222c7fd5d773ec4
parent	556f2734cce34e64a2b3a377284f3434aa12747d [diff]

Fix monotonic clock and deadlock in `dumpsys batterystats`

Bug: 315866543
Test: atest PowerStatsTests
Change-Id: Ib8d6c4fb3cd0854088b6cdaab085287903860d18

core/java/android/os/BatteryStats.java[diff]
core/java/android/os/BatteryUsageStats.java[diff]
core/java/com/android/internal/os/BatteryStatsHistory.java[diff]
core/java/com/android/internal/os/BatteryStatsHistoryIterator.java[diff]
services/core/java/com/android/server/am/BatteryStatsService.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/PowerStatsAggregator.java[diff]
services/core/java/com/android/server/power/stats/PowerStatsCollector.java[diff]
services/core/java/com/android/server/power/stats/PowerStatsExporter.java[diff]
services/core/java/com/android/server/power/stats/PowerStatsScheduler.java[diff]
services/tests/powerstatstests/src/com/android/server/power/stats/BatteryStatsHistoryIteratorTest.java[diff]
services/tests/powerstatstests/src/com/android/server/power/stats/BatteryStatsHistoryTest.java[diff]
services/tests/powerstatstests/src/com/android/server/power/stats/BatteryStatsNoteTest.java[diff]
services/tests/powerstatstests/src/com/android/server/power/stats/PowerStatsAggregatorTest.java[diff]

15 files changed

tree: fc013cfc01ae2d1bb2d1a0d13222c7fd5d773ec4