Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 40e1ef4b authored by Adam Lesinski's avatar Adam Lesinski Committed by android-build-merger
Browse files

Merge "BatteryStats: Reset per-User Bluetooth and Modem controller activity"... 

Merge "BatteryStats: Reset per-User Bluetooth and Modem controller activity" into nyc-dev am: 4f928358
am: 6226d0a3

* commit '6226d0a3':
  BatteryStats: Reset per-User Bluetooth and Modem controller activity

Change-Id: I9bd04d2000ed5041e25dff7957b8d12200e64f17
parents 3e37c335 6226d0a3

core/java/com/android/internal/os/BatteryStatsImpl.java

+4 −4
Original line number Diff line number Diff line
@@ -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);