diff options
| author | Wink Saville <wink@google.com> | 2012-08-13 15:37:08 -0700 |
|---|---|---|
| committer | android code review <noreply-gerritcodereview@google.com> | 2012-08-13 15:37:09 -0700 |
| commit | b17a583a3acc57db845993599e4de56e91d5e75a (patch) | |
| tree | 79e7ece8e6df548bc4cfbe4338eb9c2d3961c19b /wifi/java/android/net | |
| parent | 28dba4fc394f0736e1d7bdf5601382c19c08f518 (diff) | |
| parent | a6b6556082d371da030f2b32699380d1e0f00c28 (diff) | |
| download | frameworks_base-b17a583a3acc57db845993599e4de56e91d5e75a.zip frameworks_base-b17a583a3acc57db845993599e4de56e91d5e75a.tar.gz frameworks_base-b17a583a3acc57db845993599e4de56e91d5e75a.tar.bz2 | |
Merge "Fix interface name for tethering"
Diffstat (limited to 'wifi/java/android/net')
| -rw-r--r-- | wifi/java/android/net/wifi/WifiStateMachine.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/wifi/java/android/net/wifi/WifiStateMachine.java b/wifi/java/android/net/wifi/WifiStateMachine.java index 23b1b44..bb09704 100644 --- a/wifi/java/android/net/wifi/WifiStateMachine.java +++ b/wifi/java/android/net/wifi/WifiStateMachine.java @@ -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) { |