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

This commit is contained in:
TreeHugger Robot
2016-04-30 03:26:37 +00:00
committed by Android (Google) Code Review

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);