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

Commit 3d5a0d06 authored by lesl's avatar lesl
Browse files

wifi: Add APIs to set dual bands and dual channels 

1. Add new APIs (get/set Bands/Channels) to support config the dual APs
mode.

2. Update the old API (get Band/Channel) to return smallest band/channel
which associated to the smallest band in dual bands setting.

The valid bands doesn't limit to 2GHZ & 5GHZ,
but the daul APs setting should be 2.4GHZ and 5GHZ on pixel.

PS: Also fix incorrect java doc link and descritpion.

Bug: 162686273
CTS-Coverage-Bug: 171179478
Test: atest FrameworksWifiApiTests
Change-Id: Id000a600c4786bd343e0ef69a7d489658f017037
parent 81cecc50

api/system-current.txt

+4 −0
Original line number Diff line number Diff line
@@ -7489,8 +7489,10 @@ package android.net.wifi { 
  public final class SoftApConfiguration implements android.os.Parcelable {

    method @NonNull public java.util.List<android.net.MacAddress> getAllowedClientList();

    method public int getBand();

    method @NonNull public int[] getBands();

    method @NonNull public java.util.List<android.net.MacAddress> getBlockedClientList();

    method public int getChannel();

    method @NonNull public android.util.SparseIntArray getChannels();

    method public int getMacRandomizationSetting();

    method public int getMaxNumberOfClients();

    method public long getShutdownTimeoutMillis();
@@ -7512,9 +7514,11 @@ package android.net.wifi { 
    method @NonNull public android.net.wifi.SoftApConfiguration.Builder setAllowedClientList(@NonNull java.util.List<android.net.MacAddress>);

    method @NonNull public android.net.wifi.SoftApConfiguration.Builder setAutoShutdownEnabled(boolean);

    method @NonNull public android.net.wifi.SoftApConfiguration.Builder setBand(int);

    method @NonNull public android.net.wifi.SoftApConfiguration.Builder setBands(@NonNull int[]);

    method @NonNull public android.net.wifi.SoftApConfiguration.Builder setBlockedClientList(@NonNull java.util.List<android.net.MacAddress>);

    method @NonNull public android.net.wifi.SoftApConfiguration.Builder setBssid(@Nullable android.net.MacAddress);

    method @NonNull public android.net.wifi.SoftApConfiguration.Builder setChannel(int, int);

    method @NonNull public android.net.wifi.SoftApConfiguration.Builder setChannels(@NonNull android.util.SparseIntArray);

    method @NonNull public android.net.wifi.SoftApConfiguration.Builder setClientControlByUserEnabled(boolean);

    method @NonNull public android.net.wifi.SoftApConfiguration.Builder setHiddenSsid(boolean);

    method @NonNull public android.net.wifi.SoftApConfiguration.Builder setMacRandomizationSetting(int);

wifi/api/system-current.txt

+4 −0
Original line number Diff line number Diff line
@@ -252,8 +252,10 @@ package android.net.wifi { 
  public final class SoftApConfiguration implements android.os.Parcelable {

    method @NonNull public java.util.List<android.net.MacAddress> getAllowedClientList();

    method public int getBand();

    method @NonNull public int[] getBands();

    method @NonNull public java.util.List<android.net.MacAddress> getBlockedClientList();

    method public int getChannel();

    method @NonNull public android.util.SparseIntArray getChannels();

    method public int getMacRandomizationSetting();

    method public int getMaxNumberOfClients();

    method public long getShutdownTimeoutMillis();
@@ -275,9 +277,11 @@ package android.net.wifi { 
    method @NonNull public android.net.wifi.SoftApConfiguration.Builder setAllowedClientList(@NonNull java.util.List<android.net.MacAddress>);

    method @NonNull public android.net.wifi.SoftApConfiguration.Builder setAutoShutdownEnabled(boolean);

    method @NonNull public android.net.wifi.SoftApConfiguration.Builder setBand(int);

    method @NonNull public android.net.wifi.SoftApConfiguration.Builder setBands(@NonNull int[]);

    method @NonNull public android.net.wifi.SoftApConfiguration.Builder setBlockedClientList(@NonNull java.util.List<android.net.MacAddress>);

    method @NonNull public android.net.wifi.SoftApConfiguration.Builder setBssid(@Nullable android.net.MacAddress);

    method @NonNull public android.net.wifi.SoftApConfiguration.Builder setChannel(int, int);

    method @NonNull public android.net.wifi.SoftApConfiguration.Builder setChannels(@NonNull android.util.SparseIntArray);

    method @NonNull public android.net.wifi.SoftApConfiguration.Builder setClientControlByUserEnabled(boolean);

    method @NonNull public android.net.wifi.SoftApConfiguration.Builder setHiddenSsid(boolean);

    method @NonNull public android.net.wifi.SoftApConfiguration.Builder setMacRandomizationSetting(int);

wifi/java/android/net/wifi/SoftApConfiguration.java

+247 −72

File changed.

Preview size limit exceeded, changes collapsed.

wifi/tests/src/android/net/wifi/SoftApConfigurationTest.java

+134 −0

File changed.

Preview size limit exceeded, changes collapsed.