Merge commit '7e5e791' into merge2
Change-Id: Ie4889e3448b905afe5c0df453da96df0735e60d7
diff --git a/api/current.txt b/api/current.txt
index a5dc7b6..922ba42 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -19283,8 +19283,6 @@
field public java.util.BitSet allowedKeyManagement;
field public java.util.BitSet allowedPairwiseCiphers;
field public java.util.BitSet allowedProtocols;
- field public int apBand;
- field public int apChannel;
field public android.net.wifi.WifiEnterpriseConfig enterpriseConfig;
field public boolean hiddenSSID;
field public int networkId;
diff --git a/api/system-current.txt b/api/system-current.txt
index 2e29a3d..82a696f 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -20982,8 +20982,6 @@
field public java.util.BitSet allowedKeyManagement;
field public java.util.BitSet allowedPairwiseCiphers;
field public java.util.BitSet allowedProtocols;
- field public int apBand;
- field public int apChannel;
field public java.lang.String creatorName;
field public int creatorUid;
field public android.net.wifi.WifiEnterpriseConfig enterpriseConfig;
diff --git a/wifi/java/android/net/wifi/WifiConfiguration.java b/wifi/java/android/net/wifi/WifiConfiguration.java
index 21161b4..b731316 100644
--- a/wifi/java/android/net/wifi/WifiConfiguration.java
+++ b/wifi/java/android/net/wifi/WifiConfiguration.java
@@ -243,7 +243,7 @@
* The band which AP resides on
* 0-2G 1-5G
* By default, 2G is chosen
- * @hidden
+ * @hide
*/
public int apBand = 0;
@@ -252,7 +252,7 @@
* 2G 1-11
* 5G 36,40,44,48,149,153,157,161,165
* 0 - find a random available channel according to the apBand
- * @hidden
+ * @hide
*/
public int apChannel = 0;