1739076ef9cc940c54cbde3f0576f0dc228f7d68 - platform/frameworks/base

commit	1739076ef9cc940c54cbde3f0576f0dc228f7d68	[log] [tgz]
author	Adam Lesinski <adamlesinski@google.com>	Fri Apr 10 13:17:47 2015 -0700
committer	Adam Lesinski <adamlesinski@google.com>	Fri Apr 10 13:17:47 2015 -0700
tree	7c795b2691d15cc27591e978ac32bd72082dfe5c
parent	a826c4b7a4c7ffd471973d58e46ac6f1f2cad83a [diff]

Fix deadlock issue in BatteryStatsHelper.

It was assumed that BatteryStatsHelper could safely call into system services.
Because it is used when dumping information from the BatteryStatsService,
this assumption was incorrect.

Now the BatteryStats object carries around the state of the energy reporting
for Bluetooth and WiFi, so BatteryStatsHelper avoids a query into WiFiManager.

b/19729960

Change-Id: I8745cf6aafeea8e862e34fe63b20056f6ba54b40

core/java/android/os/BatteryStats.java[diff]
core/java/com/android/internal/os/BatteryStatsHelper.java[diff]
core/java/com/android/internal/os/BatteryStatsImpl.java[diff]
core/java/com/android/internal/os/WifiPowerCalculator.java[diff]

4 files changed

tree: 7c795b2691d15cc27591e978ac32bd72082dfe5c