diff options
| author | Vinit Deshpande <vinitd@google.com> | 2015-03-09 19:01:35 -0700 |
|---|---|---|
| committer | Vinit Deshpande <vinitd@google.com> | 2015-03-09 19:01:35 -0700 |
| commit | 3cb5e4d72f4a22251b8fae253e0ccae38a5e70da (patch) | |
| tree | 6a600b022b05e914216212fa75f5b9acdb9812c7 /services | |
| parent | 76f9aceecfba5459bcad4c4f144ddca93383d713 (diff) | |
| parent | 18ae1d22077e1cd8ed71b1e74d14a3a2c4e50a62 (diff) | |
| download | frameworks_base-3cb5e4d72f4a22251b8fae253e0ccae38a5e70da.zip frameworks_base-3cb5e4d72f4a22251b8fae253e0ccae38a5e70da.tar.gz frameworks_base-3cb5e4d72f4a22251b8fae253e0ccae38a5e70da.tar.bz2 | |
am "get channel list from driver for SoftAP channel selection"
merged from partner/m-wireless-wifi-dev
18ae1d2 get channel list from driver for SoftAP channel selection
Diffstat (limited to 'services')
| -rw-r--r-- | services/core/java/com/android/server/NetworkManagementService.java | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/services/core/java/com/android/server/NetworkManagementService.java b/services/core/java/com/android/server/NetworkManagementService.java index 170c4e2..0437a2a 100644 --- a/services/core/java/com/android/server/NetworkManagementService.java +++ b/services/core/java/com/android/server/NetworkManagementService.java @@ -1373,14 +1373,8 @@ public class NetworkManagementService extends INetworkManagementService.Stub if (wifiConfig == null) { mConnector.execute("softap", "set", wlanIface); } else { - int apChannel; - if (wifiConfig.apChannel == 0) { - apChannel = WifiConfiguration.chooseApChannel(wifiConfig.apBand); - } else { - apChannel = wifiConfig.apChannel; - } mConnector.execute("softap", "set", wlanIface, wifiConfig.SSID, - "broadcast", Integer.toString(apChannel), + "broadcast", Integer.toString(wifiConfig.apChannel), getSecurityType(wifiConfig), new SensitiveArg(wifiConfig.preSharedKey)); } |