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

Commit 39fa40cb authored by Adam Lesinski's avatar Adam Lesinski Committed by Android (Google) Code Review
Browse files

Merge "Disable WiFi energy data collection to avoid deadlock"

parents a92c0780 cb204c33

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

+3 −1
Original line number Diff line number Diff line
@@ -7422,7 +7422,9 @@ public final class BatteryStatsImpl extends BatteryStats { 
        updateNetworkActivityLocked(NET_UPDATE_ALL, SystemClock.elapsedRealtime());

        // TODO(adamlesinski): enable when bluedroid stops deadlocking. b/19248786

        // updateBluetoothControllerActivityLocked();

        updateWifiControllerActivityLocked();

        // TODO(adamlesinski): disabled to avoid deadlock. Need to change how external

        // data is pulled/accessed from BatteryStats. b/19729960

        // updateWifiControllerActivityLocked();

        if (mOnBatteryInternal) {

            final boolean screenOn = mScreenState == Display.STATE_ON;

            updateDischargeScreenLevelsLocked(screenOn, screenOn);