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

Commit ce5d9133 authored by Christopher Wiley's avatar Christopher Wiley
Browse files

Allow WiFi components to manage interface up state 

Setting the WiFi network interface up or down is racy because it
is not synchronized with the WiFi components managing the interface.

This causes a problem for hostapd when the interface is marked down
before hostapd starts because it causes the driver to enter the
de-initialization process.  hostapd does not know how to react to this
change of events.

Bug: 31205821
Test: bug no longer reproduces on upcoming devices, unit tests pass

Change-Id: I96938e2aef89b400593d42ce1b0a6ccc2d2e5754
parent 16e10074

core/java/android/net/InterfaceConfiguration.java

+8 −0
Original line number Diff line number Diff line
@@ -80,6 +80,14 @@ public class InterfaceConfiguration implements Parcelable { 
        mFlags.add(FLAG_DOWN);

    }



    /**

     * Set flags so that no changes will be made to the up/down status.

     */

    public void ignoreInterfaceUpDownStatus() {

        mFlags.remove(FLAG_UP);

        mFlags.remove(FLAG_DOWN);

    }



    public LinkAddress getLinkAddress() {

        return mAddr;

    }

services/core/java/com/android/server/connectivity/tethering/TetherInterfaceStateMachine.java

+10 −3
Original line number Diff line number Diff line
@@ -136,11 +136,18 @@ public class TetherInterfaceStateMachine extends StateMachine { 
            if (ifcg != null) {

                InetAddress addr = NetworkUtils.numericToInetAddress(ipAsString);

                ifcg.setLinkAddress(new LinkAddress(addr, prefixLen));

                if (mInterfaceType == ConnectivityManager.TETHERING_WIFI) {

                    // The WiFi stack has ownership of the interface up/down state.

                    // It is unclear whether the bluetooth or USB stacks will manage their own

                    // state.

                    ifcg.ignoreInterfaceUpDownStatus();

                } else {

                    if (enabled) {

                        ifcg.setInterfaceUp();

                    } else {

                        ifcg.setInterfaceDown();

                    }

                }

                ifcg.clearFlag("running");

                mNMService.setInterfaceConfig(mIfaceName, ifcg);

            }