diff options
| author | Irfan Sheriff <isheriff@google.com> | 2011-07-23 22:30:36 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-07-23 22:30:36 -0700 |
| commit | e30c1307fbb8f5421515e26ede403e0f6adc2612 (patch) | |
| tree | 1fc1cf65765b209fa375dbb2142c978ef6e89f18 /services/java/com | |
| parent | 2182a3b6422f367d84384e25006ba201c4cd233b (diff) | |
| parent | 23eb297c771bd996fe8559178feb1a07be43ad72 (diff) | |
| download | frameworks_base-e30c1307fbb8f5421515e26ede403e0f6adc2612.zip frameworks_base-e30c1307fbb8f5421515e26ede403e0f6adc2612.tar.gz frameworks_base-e30c1307fbb8f5421515e26ede403e0f6adc2612.tar.bz2 | |
Merge "Handle hostapd and tether interface changes"
Diffstat (limited to 'services/java/com')
| -rw-r--r-- | services/java/com/android/server/NetworkManagementService.java | 5 | ||||
| -rw-r--r-- | services/java/com/android/server/connectivity/Tethering.java | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/services/java/com/android/server/NetworkManagementService.java b/services/java/com/android/server/NetworkManagementService.java index 2366fcb..17ad268 100644 --- a/services/java/com/android/server/NetworkManagementService.java +++ b/services/java/com/android/server/NetworkManagementService.java @@ -849,7 +849,6 @@ class NetworkManagementService extends INetworkManagementService.Stub { mContext.enforceCallingOrSelfPermission( android.Manifest.permission.CHANGE_WIFI_STATE, "NetworkManagementService"); try { - mConnector.doCommand(String.format("softap stop " + wlanIface)); mConnector.doCommand(String.format("softap fwreload " + wlanIface + " AP")); mConnector.doCommand(String.format("softap start " + wlanIface)); if (wifiConfig == null) { @@ -897,13 +896,15 @@ class NetworkManagementService extends INetworkManagementService.Stub { } } - public void stopAccessPoint() throws IllegalStateException { + public void stopAccessPoint(String wlanIface) throws IllegalStateException { mContext.enforceCallingOrSelfPermission( android.Manifest.permission.CHANGE_NETWORK_STATE, "NetworkManagementService"); mContext.enforceCallingOrSelfPermission( android.Manifest.permission.CHANGE_WIFI_STATE, "NetworkManagementService"); try { mConnector.doCommand("softap stopap"); + mConnector.doCommand("softap stop " + wlanIface); + mConnector.doCommand(String.format("softap fwreload " + wlanIface + " STA")); } catch (NativeDaemonConnectorException e) { throw new IllegalStateException("Error communicating to native daemon to stop soft AP", e); diff --git a/services/java/com/android/server/connectivity/Tethering.java b/services/java/com/android/server/connectivity/Tethering.java index 7a5a641..a5a6d8e 100644 --- a/services/java/com/android/server/connectivity/Tethering.java +++ b/services/java/com/android/server/connectivity/Tethering.java @@ -211,6 +211,8 @@ public class Tethering extends INetworkManagementEventObserver.Stub { } public void interfaceLinkStateChanged(String iface, boolean up) { + if (DEBUG) Log.d(TAG, "interfaceLinkStateChanged " + iface + ", " + up); + interfaceStatusChanged(iface, up); } private boolean isUsb(String iface) { |