20bcb0befb7ca1974d6add7fa12d2493d555f072 - platform/frameworks/base

commit: 20bcb0befb7ca1974d6add7fa12d2493d555f072
[log] [tgz]
author: Michael Wachenschwanz <mwachens@google.com>
Thu Mar 02 23:57:40 2023 +0000
committer: Android Build Coastguard Worker <android-build-coastguard-worker@google.com>
Fri Mar 03 03:28:31 2023 +0000
tree: f96eb821c88db252bc8c53e1bdaadb43c8d098f1
parent: 613096a244af13712bffe97a60393cd82b59c36b [diff]

Revert "Add config to control BatteryStats reset logic"

Revert submission 21485850

Reason for revert: introduced deadlock

Reverted changes: /q/submissionid:21485850

Change-Id: Id3f920a130bc20d59abefc0a2f018873b08415ed
(cherry picked from commit e01cead961206f75701326396435433b0301237f)
Merged-In: Id3f920a130bc20d59abefc0a2f018873b08415ed
(cherry picked from commit f70a3556ad8a6b5fd161773c699fe1c525908f1d)
Merged-In: Id3f920a130bc20d59abefc0a2f018873b08415ed

core/java/com/android/internal/os/BatteryStatsImpl.java[diff]
core/res/res/values/config.xml[diff]
core/res/res/values/symbols.xml[diff]
core/tests/coretests/src/com/android/internal/os/BatteryStatsResetTest.java[Deleted - diff]
services/core/java/com/android/server/am/BatteryStatsService.java[diff]

5 files changed