diff options
| author | Wink Saville <wink@google.com> | 2012-08-13 16:27:35 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-08-13 16:27:35 -0700 |
| commit | ee8655c6739cdfb35f192b05d8d4d84402e0d956 (patch) | |
| tree | f02afc7b6a3a971e1c1c20284da73fdd065f0afc /wifi | |
| parent | 9e1b5846d6f85b7e0ea96a65d3cb1fecd0f568d4 (diff) | |
| parent | 2605aeeb30e39c2616bbe6ff088d1ed0020b4a3b (diff) | |
| download | frameworks_base-ee8655c6739cdfb35f192b05d8d4d84402e0d956.zip frameworks_base-ee8655c6739cdfb35f192b05d8d4d84402e0d956.tar.gz frameworks_base-ee8655c6739cdfb35f192b05d8d4d84402e0d956.tar.bz2 | |
am 2605aeeb: am b17a583a: Merge "Fix interface name for tethering"
* commit '2605aeeb30e39c2616bbe6ff088d1ed0020b4a3b':
Fix interface name for tethering
Diffstat (limited to 'wifi')
| -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 1b7894e..bdb02c5 100644 --- a/wifi/java/android/net/wifi/WifiStateMachine.java +++ b/wifi/java/android/net/wifi/WifiStateMachine.java @@ -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) { |