am 2605aeeb: am b17a583a: Merge "Fix interface name for tethering"

* commit '2605aeeb30e39c2616bbe6ff088d1ed0020b4a3b':
  Fix interface name for tethering
This commit is contained in:
Wink Saville
2012-08-13 16:27:35 -07:00
committed by Android Git Automerger

View File

@ -1261,14 +1261,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) {