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

Commit cb204c33 authored by Adam Lesinski's avatar Adam Lesinski
Browse files

Disable WiFi energy data collection to avoid deadlock 

This is a temporary fix to prevent deadlocking in the
system. Need to come up with a better solution for
accessing WiFi and other subsystems from BatteryStats.

b/19729960

Change-Id: I464e7490c9780249d2a3eef05ce084a7d84372c0
parent f9eb4b90

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

+3 −1
Original line number Diff line number Diff line
@@ -7361,7 +7361,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);