diff options
author | Etan Cohen <etancohen@google.com> | 2015-04-24 14:03:28 -0700 |
---|---|---|
committer | Etan Cohen <etancohen@google.com> | 2015-04-24 14:03:28 -0700 |
commit | 644f41368f9eddd475fa9c5dddc7ceac5722a3a8 (patch) | |
tree | 7debb618bbe004bd6e710e758a7302715e96a3f2 /wifi/java/android/net/wifi/WifiConfiguration.java | |
parent | a6e5ff899a7cc300985c09e57a2e3b4f5aa170d3 (diff) | |
parent | 4cb5d80abeb88918534e90c2a7b58cdcba22ac77 (diff) | |
download | frameworks_base-644f41368f9eddd475fa9c5dddc7ceac5722a3a8.zip frameworks_base-644f41368f9eddd475fa9c5dddc7ceac5722a3a8.tar.gz frameworks_base-644f41368f9eddd475fa9c5dddc7ceac5722a3a8.tar.bz2 |
Merge commit '4cb5d80' into merge2
Diffstat (limited to 'wifi/java/android/net/wifi/WifiConfiguration.java')
-rw-r--r-- | wifi/java/android/net/wifi/WifiConfiguration.java | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/wifi/java/android/net/wifi/WifiConfiguration.java b/wifi/java/android/net/wifi/WifiConfiguration.java index 802e0d2..21161b4 100644 --- a/wifi/java/android/net/wifi/WifiConfiguration.java +++ b/wifi/java/android/net/wifi/WifiConfiguration.java @@ -243,6 +243,7 @@ public class WifiConfiguration implements Parcelable { * The band which AP resides on * 0-2G 1-5G * By default, 2G is chosen + * @hidden */ public int apBand = 0; @@ -251,6 +252,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 */ public int apChannel = 0; |