Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 18ae1d22 authored by xinhe's avatar xinhe
Browse files

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
parent 5d7768ff

api/current.txt

+0 −1
Original line number Diff line number Diff line
@@ -17899,7 +17899,6 @@ package android.net.wifi { 














  public class WifiConfiguration implements android.os.Parcelable {















    ctor public WifiConfiguration();













    method public static int chooseApChannel(int);















    method public int describeContents();















    method public void writeToParcel(android.os.Parcel, int);















    field public java.lang.String BSSID;

























services/core/java/com/android/server/NetworkManagementService.java



+1
−7




























Original line number
Diff line number
Diff line








@@ -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));















            }

































wifi/java/android/net/wifi/WifiConfiguration.java



+0
−14




























Original line number
Diff line number
Diff line








@@ -62,8 +62,6 @@ public class WifiConfiguration implements Parcelable {













    public static final String updateIdentiferVarName = "update_identifier";















    /** {@hide} */















    public static final int INVALID_NETWORK_ID = -1;













    /**{@hide}*/













    private static Random mRandom = new Random(Calendar.getInstance().getTimeInMillis());































    /**















     * Recognized key management schemes.










@@ -1337,18 +1335,6 @@ public class WifiConfiguration implements Parcelable {













        }















    }





























    public static int chooseApChannel(int apBand) {













        int apChannel;













        if (apBand == 0) {













            apChannel = 1 + mRandom.nextInt(11);













        } else {













            int channel[] = {36,40,44,48,149,153,157,161,165};













            apChannel = channel[mRandom.nextInt(channel.length)];













        }













        Log.d(TAG, "AP set on channel " +  apChannel);













        return apChannel;













     }





























    /** @hide */















    public int getAuthType() {















        if (isValid() == false) {