diff options
| author | Adam Lesinski <adamlesinski@google.com> | 2015-03-19 14:35:45 -0700 |
|---|---|---|
| committer | Adam Lesinski <adamlesinski@google.com> | 2015-03-26 17:49:51 -0700 |
| commit | 4b6bd8d36b093d36d9ae80b43e95049c259d7319 (patch) | |
| tree | 441b1dbd637e667fceb3fcda96c91f20a3425a03 /core/java/android/os/BatteryStats.java | |
| parent | d640b7a6c7ac0998a9f55bdcfff6bf2960edb9bd (diff) | |
| download | frameworks_base-4b6bd8d36b093d36d9ae80b43e95049c259d7319.zip frameworks_base-4b6bd8d36b093d36d9ae80b43e95049c259d7319.tar.gz frameworks_base-4b6bd8d36b093d36d9ae80b43e95049c259d7319.tar.bz2 | |
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
Diffstat (limited to 'core/java/android/os/BatteryStats.java')
| -rw-r--r-- | core/java/android/os/BatteryStats.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/core/java/android/os/BatteryStats.java b/core/java/android/os/BatteryStats.java index 1a06e0a..8b3ecae 100644 --- a/core/java/android/os/BatteryStats.java +++ b/core/java/android/os/BatteryStats.java @@ -3233,9 +3233,9 @@ public abstract class BatteryStats implements Parcelable { if (!didOne) sb.append(" (no activity)"); pw.println(sb.toString()); - final long wifiIdleTimeMs = getBluetoothControllerActivity(CONTROLLER_IDLE_TIME, which); - final long wifiRxTimeMs = getBluetoothControllerActivity(CONTROLLER_RX_TIME, which); - final long wifiTxTimeMs = getBluetoothControllerActivity(CONTROLLER_TX_TIME, which); + final long wifiIdleTimeMs = getWifiControllerActivity(CONTROLLER_IDLE_TIME, which); + final long wifiRxTimeMs = getWifiControllerActivity(CONTROLLER_RX_TIME, which); + final long wifiTxTimeMs = getWifiControllerActivity(CONTROLLER_TX_TIME, which); final long wifiTotalTimeMs = wifiIdleTimeMs + wifiRxTimeMs + wifiTxTimeMs; sb.setLength(0); |