drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* 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
parent 9e1b5846d6 2605aeeb30
commit ee8655c673
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
wifi/java/android/net/wifi/WifiStateMachine.java
View File

@ -1261,14 +1261,14 @@ public class WifiStateMachine extends StateMachine {
ip settings */ ip settings */
InterfaceConfiguration ifcg = null; InterfaceConfiguration ifcg = null;
try { try {
ifcg = mNwService.getInterfaceConfig(mInterfaceName); ifcg = mNwService.getInterfaceConfig(mTetherInterfaceName);
if (ifcg != null) { if (ifcg != null) {
ifcg.setLinkAddress( ifcg.setLinkAddress(
new LinkAddress(NetworkUtils.numericToInetAddress("0.0.0.0"), 0)); new LinkAddress(NetworkUtils.numericToInetAddress("0.0.0.0"), 0));
mNwService.setInterfaceConfig(mInterfaceName, ifcg); mNwService.setInterfaceConfig(mTetherInterfaceName, ifcg);
} }
} catch (Exception e) { } catch (Exception e) {
loge("Error resetting interface " + mInterfaceName + ", :" + e); loge("Error resetting interface " + mTetherInterfaceName + ", :" + e);
} }
if (mCm.untether(mTetherInterfaceName) != ConnectivityManager.TETHER_ERROR_NO_ERROR) { if (mCm.untether(mTetherInterfaceName) != ConnectivityManager.TETHER_ERROR_NO_ERROR) {