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

Commit 121a034d authored by lesl's avatar lesl
Browse files

wifi: make BAND_ANY to deprecated 

Require to use bands bit mask to replace BAND_ANY.
The current bands are a bit mask. It already supported multi-bands
setting. The BAND_ANY will causes limitation when adding the new band setting.

Mark BAND_ANY to deprecated and replace all of the test code to use bit
mask.

Bug: 162899642
Test: atest FrameworksWifiApiTests
Change-Id: I0d379e60ed52e569a992ee566e4281cffa42aec9
parent 9dc64dbd

api/system-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -7292,7 +7292,7 @@ package android.net.wifi { 
    field public static final int BAND_2GHZ = 1; // 0x1

    field public static final int BAND_5GHZ = 2; // 0x2

    field public static final int BAND_6GHZ = 4; // 0x4

    field public static final int BAND_ANY = 7; // 0x7

    field @Deprecated public static final int BAND_ANY = 7; // 0x7

    field public static final int RANDOMIZATION_NONE = 0; // 0x0

    field public static final int RANDOMIZATION_PERSISTENT = 1; // 0x1

  }

wifi/api/system-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -263,7 +263,7 @@ package android.net.wifi { 
    field public static final int BAND_2GHZ = 1; // 0x1

    field public static final int BAND_5GHZ = 2; // 0x2

    field public static final int BAND_6GHZ = 4; // 0x4

    field public static final int BAND_ANY = 7; // 0x7

    field @Deprecated public static final int BAND_ANY = 7; // 0x7

    field public static final int RANDOMIZATION_NONE = 0; // 0x0

    field public static final int RANDOMIZATION_PERSISTENT = 1; // 0x1

  }

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

+3 −0
Original line number Diff line number Diff line
@@ -90,6 +90,9 @@ public final class SoftApConfiguration implements Parcelable { 
     * Device is allowed to choose the optimal band (2Ghz, 5Ghz, 6Ghz) based on device capability,

     * operating country code and current radio conditions.

     * @hide

     *

     * @deprecated The bands are a bit mask - use any combination of {@code BAND_},

     * for instance {@code BAND_2GHZ | BAND_5GHZ | BAND_6GHZ}.

     */

    @SystemApi

    public static final int BAND_ANY = BAND_2GHZ | BAND_5GHZ | BAND_6GHZ;