summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorxinhe <xinhe@google.com>2015-04-21 15:42:03 -0700
committerxinhe <xinhe@google.com>2015-04-21 15:42:03 -0700
commit7e5e791d22e76eb576fd5cf6dd5437b8050b0438 (patch)
tree47de7e5886c170c719f566e0f1aaf3c199388fdb
parent170102d631555ee5c9e3220ea24fec07d99603e1 (diff)
downloadframeworks_base-7e5e791d22e76eb576fd5cf6dd5437b8050b0438.zip
frameworks_base-7e5e791d22e76eb576fd5cf6dd5437b8050b0438.tar.gz
frameworks_base-7e5e791d22e76eb576fd5cf6dd5437b8050b0438.tar.bz2
Fix build error on API
Change-Id: Id7024feb6baf8c6cc607702b3ac90dfbd3d483ba
-rw-r--r--api/current.txt2
-rw-r--r--api/system-current.txt2
-rw-r--r--wifi/java/android/net/wifi/WifiConfiguration.java4
3 files changed, 2 insertions, 6 deletions
diff --git a/api/current.txt b/api/current.txt
index 8d9d56e..2b6f50c 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -18003,8 +18003,6 @@ package android.net.wifi {
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 65c5115..2cb4609 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -19504,8 +19504,6 @@ package android.net.wifi {
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 int creatorUid;
field public android.net.wifi.WifiEnterpriseConfig enterpriseConfig;
field public boolean hiddenSSID;
diff --git a/wifi/java/android/net/wifi/WifiConfiguration.java b/wifi/java/android/net/wifi/WifiConfiguration.java
index b52f6cf..1521623 100644
--- a/wifi/java/android/net/wifi/WifiConfiguration.java
+++ b/wifi/java/android/net/wifi/WifiConfiguration.java
@@ -239,7 +239,7 @@ public class WifiConfiguration implements Parcelable {
* The band which AP resides on
* 0-2G 1-5G
* By default, 2G is chosen
- * @hidden
+ * @hide
*/
public int apBand = 0;
@@ -248,7 +248,7 @@ public class WifiConfiguration implements Parcelable {
* 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;