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

Commit e68fdb17 authored by Steve Kondik's avatar Steve Kondik Committed by Gerrit Code Review
Browse files

Merge "tether down: mTetherInterfaceName vs mInterfaceName mismatch" into ics

parents 356ad795 07ad7004

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

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

        InterfaceConfiguration ifcg = null;

        try {

            ifcg = mNwService.getInterfaceConfig(mInterfaceName);

            ifcg = mNwService.getInterfaceConfig(mTetherInterfaceName);

            if (ifcg != null) {

                ifcg.addr = 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) {