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

Commit 41bb9862 authored by David Su's avatar David Su Committed by Android (Google) Code Review
Browse files

Merge "WifiConfiguration: unmark apBand as @SystemApi"

parents 1527beb3 fd5cbd65

api/system-current.txt

+0 −4
Original line number Diff line number Diff line
@@ -7517,9 +7517,6 @@ package android.net.wifi { 
    method @Deprecated public boolean isNoInternetAccessExpected();

    method @Deprecated public void setIpConfiguration(@Nullable android.net.IpConfiguration);

    method @Deprecated public void setNetworkSelectionStatus(@NonNull android.net.wifi.WifiConfiguration.NetworkSelectionStatus);

    field @Deprecated public static final int AP_BAND_2GHZ = 0; // 0x0

    field @Deprecated public static final int AP_BAND_5GHZ = 1; // 0x1

    field @Deprecated public static final int AP_BAND_ANY = -1; // 0xffffffff

    field @Deprecated public static final int INVALID_NETWORK_ID = -1; // 0xffffffff

    field @Deprecated public static final int METERED_OVERRIDE_METERED = 1; // 0x1

    field @Deprecated public static final int METERED_OVERRIDE_NONE = 0; // 0x0
@@ -7529,7 +7526,6 @@ package android.net.wifi { 
    field @Deprecated public static final int RECENT_FAILURE_AP_UNABLE_TO_HANDLE_NEW_STA = 17; // 0x11

    field @Deprecated public static final int RECENT_FAILURE_NONE = 0; // 0x0

    field @Deprecated public boolean allowAutojoin;

    field @Deprecated public int apBand;

    field @Deprecated public int carrierId;

    field @Deprecated public String creatorName;

    field @Deprecated public int creatorUid;

api/system-lint-baseline.txt

+0 −2
Original line number Diff line number Diff line
@@ -200,8 +200,6 @@ MutableBareField: android.net.IpConfiguration#staticIpConfiguration: 
    

MutableBareField: android.net.wifi.WifiConfiguration#allowAutojoin:

    

MutableBareField: android.net.wifi.WifiConfiguration#apBand:

    

MutableBareField: android.net.wifi.WifiConfiguration#carrierId:

    

MutableBareField: android.net.wifi.WifiConfiguration#fromWifiNetworkSpecifier:

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

+1 −4
Original line number Diff line number Diff line
@@ -568,14 +568,12 @@ public class WifiConfiguration implements Parcelable { 
     * 2GHz band.

     * @hide

     */

    @SystemApi

    public static final int AP_BAND_2GHZ = 0;



    /**

     * 5GHz band.

     * @hide

     */

    @SystemApi

    public static final int AP_BAND_5GHZ = 1;



    /**
@@ -583,7 +581,6 @@ public class WifiConfiguration implements Parcelable { 
     * operating country code and current radio conditions.

     * @hide

     */

    @SystemApi

    public static final int AP_BAND_ANY = -1;



    /**
@@ -593,7 +590,7 @@ public class WifiConfiguration implements Parcelable { 
     *

     * @hide

     */

    @SystemApi

    @UnsupportedAppUsage

    @ApBand

    public int apBand = AP_BAND_2GHZ;