Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "BatteryStats: Reset per-User Bluetooth and Modem controller activity" into nyc-dev

Browse Source 
am: 4f928358d2

* commit '4f928358d2a4023dc6ba5a0bbdb1a63a3e1bfa7a':
  BatteryStats: Reset per-User Bluetooth and Modem controller activity

Change-Id: I56cdc77ad57aceb8e60f7d0f834a2064d7bcd57a
This commit is contained in:
Adam Lesinski
2016-04-30 03:30:28 +00:00
committed by android-build-merger
parent 132d565eac 4f928358d2
commit 5b57ee8f5a
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/java/com/android/internal/os/BatteryStatsImpl.java
View File

@@ -5711,12 +5711,12 @@ public class BatteryStatsImpl extends BatteryStats {
mWifiControllerActivity.reset(false);
}
if (mBsi.mBluetoothActivity != null) {
mBsi.mBluetoothActivity.reset(false);
if (mBluetoothControllerActivity != null) {
mBluetoothControllerActivity.reset(false);
}
if (mBsi.mModemActivity != null) {
mBsi.mModemActivity.reset(false);
if (mModemControllerActivity != null) {
mModemControllerActivity.reset(false);
}
mUserCpuTime.reset(false);