2d970d32367e0ce7da98dc7a113cf90880292752 - android_frameworks_base

commit	2d970d32367e0ce7da98dc7a113cf90880292752	[log] [tgz]
author	Neha Jain <jainne@google.com>	Wed Aug 24 20:58:11 2022 +0000
committer	Neha Jain <jainne@google.com>	Wed Aug 24 20:58:11 2022 +0000
tree	deb9555b6b34e5c41294265d460b4d8239b2cc41
parent	bf794e45858ea052524719e7222b961da9ce8a77 [diff]

Revert "Remove BatteryStats user activity types and use PowerManager ones instead."

This reverts commit bf794e45858ea052524719e7222b961da9ce8a77.

Reason for revert: b/243434675

Change-Id: I5cfdd6a7c21ed322f50d7605fdd470b41726f4cf

core/java/android/os/BatteryStats.java[diff]
core/java/android/os/PowerManager.java[diff]
services/core/java/com/android/server/power/Notifier.java[diff]
services/core/java/com/android/server/power/PowerGroup.java[diff]
services/core/java/com/android/server/power/PowerManagerService.java[diff]
services/core/java/com/android/server/power/stats/BatteryStatsImpl.java[diff]

6 files changed