get channel list from driver for SoftAP channel selection

Instead of hard coding the available channel list, we should
get channel list from driver

Bug:19237543
Change-Id: Id2ec689273407f54709cb034d6ba666f91da51c0

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 891f572..ecf2a59 100644
--- a/services/core/java/com/android/server/NetworkManagementService.java
+++ b/services/core/java/com/android/server/NetworkManagementService.java
@@ -1352,14 +1352,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));
             }