diff options
| author | Irfan Sheriff <isheriff@google.com> | 2011-07-22 15:21:10 -0700 |
|---|---|---|
| committer | Irfan Sheriff <isheriff@google.com> | 2011-07-23 21:06:57 -0700 |
| commit | 23eb297c771bd996fe8559178feb1a07be43ad72 (patch) | |
| tree | 51b71ec0decca0f3623b2a7b2704040cf02345db /services/java | |
| parent | 556d0476e14803b406ddff7fe4c27baf1bf58334 (diff) | |
| download | frameworks_base-23eb297c771bd996fe8559178feb1a07be43ad72.zip frameworks_base-23eb297c771bd996fe8559178feb1a07be43ad72.tar.gz frameworks_base-23eb297c771bd996fe8559178feb1a07be43ad72.tar.bz2 | |
Handle hostapd and tether interface changes
The set config will only update hostapd config file right now and we need to restart after that happens.
Also, softap interface is changed to be the regular interface
Bug: 5069108
Change-Id: Ibe80129b58e5339f06f186870bcd8f37569c6db3
Diffstat (limited to 'services/java')
| -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 82bc505..322e28c 100644 --- a/services/java/com/android/server/connectivity/Tethering.java +++ b/services/java/com/android/server/connectivity/Tethering.java @@ -221,6 +221,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) { |