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

Commit 218c226b authored by Erik Kline's avatar Erik Kline
Browse files

Only disable Wi-Fi IP serving on specific interface, if available 

Test: as follows
    - built
    - flashed
    - booted
    - runtest frameworks-net passes
Bug: 32163131

Change-Id: Ifd9131bad20810ee24c9436d8c0df7a81fae11d5
parent ef6b81e5

services/core/java/com/android/server/connectivity/Tethering.java

+23 −12
Original line number Diff line number Diff line
@@ -815,30 +815,41 @@ public class Tethering extends BaseNetworkObserver { 
                    case WifiManager.WIFI_AP_STATE_DISABLING:

                    case WifiManager.WIFI_AP_STATE_FAILED:

                    default:

                        disableWifiIpServingLocked(curState);

                        disableWifiIpServingLocked(ifname, curState);

                        break;

                }

            }

        }

    }



    // TODO: Pass in the interface name and, if non-empty, only turn down IP

    // serving on that one interface.

    private void disableWifiIpServingLocked(int apState) {

        if (DBG) Log.d(TAG, "Canceling WiFi tethering request - AP_STATE=" + apState);

    private void disableWifiIpServingLocked(String ifname, int apState) {

        mLog.log("Canceling WiFi tethering request - AP_STATE=" + apState);



        // Regardless of whether we requested this transition, the AP has gone

        // down.  Don't try to tether again unless we're requested to do so.

        // TODO: Remove this altogether, once Wi-Fi reliably gives us an

        // interface name with every broadcast.

        mWifiTetherRequested = false;



        if (!TextUtils.isEmpty(ifname)) {

            final TetherState ts = mTetherStates.get(ifname);

            if (ts != null) {

                ts.stateMachine.unwanted();

                return;

            }

        }



        // Tell appropriate interface state machines that they should tear

        // themselves down.

        for (int i = 0; i < mTetherStates.size(); i++) {

            TetherInterfaceStateMachine tism = mTetherStates.valueAt(i).stateMachine;

            if (tism.interfaceType() == ConnectivityManager.TETHERING_WIFI) {

                tism.sendMessage(TetherInterfaceStateMachine.CMD_TETHER_UNREQUESTED);

                break;  // There should be at most one of these.

                tism.unwanted();

                return;

            }

        }

        // Regardless of whether we requested this transition, the AP has gone

        // down.  Don't try to tether again unless we're requested to do so.

        mWifiTetherRequested = false;



        mLog.log("Error disabling Wi-Fi IP serving; " +

                (TextUtils.isEmpty(ifname) ? "no interface name specified"

                                           : "specified interface: " + ifname));

    }



    private void enableWifiIpServingLocked(String ifname, int wifiIpMode) {

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

+2 −0
Original line number Diff line number Diff line
@@ -132,6 +132,8 @@ public class TetherInterfaceStateMachine extends StateMachine { 


    public void stop() { sendMessage(CMD_INTERFACE_DOWN); }



    public void unwanted() { sendMessage(CMD_TETHER_UNREQUESTED); }



    // configured when we start tethering and unconfig'd on error or conclusion

    private boolean configureIfaceIp(boolean enabled) {

        if (VDBG) Log.d(TAG, "configureIfaceIp(" + enabled + ")");