4b6bd8d36b093d36d9ae80b43e95049c259d7319 - platform/frameworks/base

commit	4b6bd8d36b093d36d9ae80b43e95049c259d7319	[log] [tgz]
author	Adam Lesinski <adamlesinski@google.com>	Thu Mar 19 14:35:45 2015 -0700
committer	Adam Lesinski <adamlesinski@google.com>	Thu Mar 26 17:49:51 2015 -0700
tree	441b1dbd637e667fceb3fcda96c91f20a3425a03
parent	d640b7a6c7ac0998a9f55bdcfff6bf2960edb9bd [diff]

Retrieve WiFi info outside of BatteryStatsImpl

In order to not deadlock the system, we need to retrieve
WiFi energy info outside of the BatteryStats lock. We do this,
then pass that data down to BatteryStatsImpl to process.

b/19729960

Change-Id: Ib8beba1d5ac81d89144d502c4b688d0a88c5b102

core/java/android/os/BatteryStats.java[diff]
core/java/com/android/internal/os/BatteryStatsImpl.java[diff]
core/java/com/android/internal/os/KernelWakelockReader.java[Added - diff]
core/java/com/android/internal/os/KernelWakelockStats.java[Added - diff]
services/core/java/com/android/server/am/ActivityManagerService.java[diff]
services/core/java/com/android/server/am/BatteryStatsService.java[diff]
wifi/java/android/net/wifi/WifiActivityEnergyInfo.java[diff]

7 files changed

tree: 441b1dbd637e667fceb3fcda96c91f20a3425a03