From fd5cbd6523c643708815f9dcf9bfc2ccb1267fbd Mon Sep 17 00:00:00 2001 From: David Su Date: Tue, 28 Jan 2020 15:17:39 -0800 Subject: [PATCH] WifiConfiguration: unmark apBand as @SystemApi SoftApConfiguration is the new official API for storing Soft AP configurations. Thus, remove @SystemApi for WifiConfiguration#apBand. Bug: 148424108 Bug: 146046526 Test: compiles Change-Id: I39d2a664ac336998322b63a64e174d6802b1ac54 --- api/system-current.txt | 4 ---- api/system-lint-baseline.txt | 2 -- wifi/java/android/net/wifi/WifiConfiguration.java | 5 +---- 3 files changed, 1 insertion(+), 10 deletions(-) diff --git a/api/system-current.txt b/api/system-current.txt index cdcef536892bf..b2ba9f1bb68de 100755 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -7518,9 +7518,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 @@ -7530,7 +7527,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; diff --git a/api/system-lint-baseline.txt b/api/system-lint-baseline.txt index 2f1889cea4ebf..a57e178879fa3 100644 --- a/api/system-lint-baseline.txt +++ b/api/system-lint-baseline.txt @@ -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: diff --git a/wifi/java/android/net/wifi/WifiConfiguration.java b/wifi/java/android/net/wifi/WifiConfiguration.java index 91b7df372e013..62d6067c86f3d 100644 --- a/wifi/java/android/net/wifi/WifiConfiguration.java +++ b/wifi/java/android/net/wifi/WifiConfiguration.java @@ -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;