Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "WifiConfiguration: unmark apBand as @SystemApi"

Browse Source
This commit is contained in:
David Su
2020-02-05 18:24:01 +00:00
committed by Android (Google) Code Review
parent 1527beb31e fd5cbd6523
commit 41bb9862d8
3 changed files with 1 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
api/system-current.txt
View File

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

2
api/system-lint-baseline.txt
View File

@@ -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:

5
wifi/java/android/net/wifi/WifiConfiguration.java
View File

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