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

Commit f75aa36f authored by Robert Greenwalt's avatar Robert Greenwalt
Browse files

Add wifi "HANGED" driver state triggering reload. 

The driver can now report to us that they are hosed and we'll shut
down wifi and restart it - only to be used as a last resort.

Also fixing synch problem with updateWifiState.

bug: 2173119
parent 9069aa31

services/java/com/android/server/WifiService.java

+10 −0
Original line number Diff line number Diff line
@@ -142,6 +142,7 @@ public class WifiService extends IWifiManager.Stub { 
    private static final int MESSAGE_STOP_WIFI        = 2;

    private static final int MESSAGE_START_WIFI       = 3;

    private static final int MESSAGE_RELEASE_WAKELOCK = 4;

    private static final int MESSAGE_UPDATE_STATE     = 5;



    private final  WifiHandler mWifiHandler;
@@ -1446,6 +1447,11 @@ public class WifiService extends IWifiManager.Stub { 
    }



    private void updateWifiState() {

        // send a message so it's all serialized

        Message.obtain(mWifiHandler, MESSAGE_UPDATE_STATE, 0, 0).sendToTarget();

    }



    private void doUpdateWifiState() {

        boolean wifiEnabled = getPersistedWifiEnabled();

        boolean airplaneMode = isAirplaneModeOn() && !mAirplaneModeOverwridden;

        boolean lockHeld = mLocks.hasLocks();
@@ -1551,6 +1557,10 @@ public class WifiService extends IWifiManager.Stub { 
                    sWakeLock.release();

                    break;



                case MESSAGE_UPDATE_STATE:

                    doUpdateWifiState();

                    break;



                case MESSAGE_DISABLE_WIFI:

                    // a non-zero msg.arg1 value means the "enabled" setting

                    // should be persisted

wifi/java/android/net/wifi/WifiMonitor.java

+2 −0
Original line number Diff line number Diff line
@@ -255,6 +255,8 @@ public class WifiMonitor { 
                mWifiStateTracker.notifyDriverStopped();

            } else if (state.equals("STARTED")) {

                mWifiStateTracker.notifyDriverStarted();

            } else if (state.equals("HANGED")) {

                mWifiStateTracker.notifyDriverHung();

            }

        }

wifi/java/android/net/wifi/WifiStateTracker.java

+35 −12
Original line number Diff line number Diff line
@@ -92,6 +92,13 @@ public class WifiStateTracker extends NetworkStateTracker { 
    private static final int EVENT_PASSWORD_KEY_MAY_BE_INCORRECT     = 13;

    private static final int EVENT_MAYBE_START_SCAN_POST_DISCONNECT  = 14;



    /**

     * The driver state indication.

     */

    private static final int DRIVER_STARTED                          = 0;

    private static final int DRIVER_STOPPED                          = 1;

    private static final int DRIVER_HUNG                             = 2;



    /**

     * Interval in milliseconds between polling for connection

     * status items that are not sent via asynchronous events.
@@ -556,7 +563,7 @@ public class WifiStateTracker extends NetworkStateTracker { 
        mRunState = RUN_STATE_STOPPED;



        // Send a driver stopped message to our handler

        Message.obtain(this, EVENT_DRIVER_STATE_CHANGED, 0, 0).sendToTarget();

        Message.obtain(this, EVENT_DRIVER_STATE_CHANGED, DRIVER_STOPPED, 0).sendToTarget();

    }



    /**
@@ -565,7 +572,15 @@ public class WifiStateTracker extends NetworkStateTracker { 
     */

    void notifyDriverStarted() {

        // Send a driver started message to our handler

        Message.obtain(this, EVENT_DRIVER_STATE_CHANGED, 1, 0).sendToTarget();

        Message.obtain(this, EVENT_DRIVER_STATE_CHANGED, DRIVER_STARTED, 0).sendToTarget();

    }



    /**

     * Send the tracker a notification that the Wi-Fi driver has hung and needs restarting.

     */

    void notifyDriverHung() {

        // Send a driver hanged message to our handler

        Message.obtain(this, EVENT_DRIVER_STATE_CHANGED, DRIVER_HUNG, 0).sendToTarget();

    }



    /**
@@ -1149,15 +1164,14 @@ public class WifiStateTracker extends NetworkStateTracker { 
                break;

                

            case EVENT_DRIVER_STATE_CHANGED:

                boolean driverStarted = msg.arg1 != 0;

                

                // Wi-Fi driver state changed:

                // [31- 1] Reserved for future use

                // [ 0- 0] Driver start (1) or stopped (0)   

                eventLogParam = driverStarted ? 1 : 0;

                EventLog.writeEvent(EVENTLOG_DRIVER_STATE_CHANGED, eventLogParam);

                // 0 STARTED

                // 1 STOPPED

                // 2 HUNG

                EventLog.writeEvent(EVENTLOG_DRIVER_STATE_CHANGED, msg.arg1);



                if (driverStarted) {

                switch (msg.arg1) {

                case DRIVER_STARTED:

                    /**

                     * Set the number of allowed radio channels according

                     * to the system setting, since it gets reset by the
@@ -1176,6 +1190,15 @@ public class WifiStateTracker extends NetworkStateTracker { 
                            }

                        }

                    }

                    break;

                case DRIVER_HUNG:

                    Log.e(TAG, "Wifi Driver reports HUNG - reloading.");

                    /**

                     * restart the driver - toggle off and on

                     */

                    mWM.setWifiEnabled(false);

                    mWM.setWifiEnabled(true);

                    break;

                }

                noteRunState();

                break;