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

Commit 2605aeeb authored by Wink Saville's avatar Wink Saville Committed by Android Git Automerger
Browse files

am b17a583a: Merge "Fix interface name for tethering" 

* commit 'b17a583a':
  Fix interface name for tethering
parents 0b4771e0 b17a583a

wifi/java/android/net/wifi/WifiStateMachine.java

+3 −3
Original line number Diff line number Diff line
@@ -1240,14 +1240,14 @@ public class WifiStateMachine extends StateMachine { 
           ip settings */

        InterfaceConfiguration ifcg = null;

        try {

            ifcg = mNwService.getInterfaceConfig(mInterfaceName);

            ifcg = mNwService.getInterfaceConfig(mTetherInterfaceName);

            if (ifcg != null) {

                ifcg.setLinkAddress(

                        new LinkAddress(NetworkUtils.numericToInetAddress("0.0.0.0"), 0));

                mNwService.setInterfaceConfig(mInterfaceName, ifcg);

                mNwService.setInterfaceConfig(mTetherInterfaceName, ifcg);

            }

        } catch (Exception e) {

            loge("Error resetting interface " + mInterfaceName + ", :" + e);

            loge("Error resetting interface " + mTetherInterfaceName + ", :" + e);

        }



        if (mCm.untether(mTetherInterfaceName) != ConnectivityManager.TETHER_ERROR_NO_ERROR) {