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

Merge "documentation fixes" into nyc-mr1-dev

Browse Source 
am: 14826e5489

Change-Id: I18df5f88d8f72ec74e62b39a056459e4e715b9db
This commit is contained in:
David Farrow
2017-04-27 17:09:26 +00:00
committed by android-build-merger
parent 31add96517 14826e5489
commit b1e3d9ab26
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -215,9 +215,9 @@ public class WifiConfiguration implements Parcelable {
*/
public int networkId;
// Fixme We need remove this field to use only Quality network selection status only
/**
* The current status of this network configuration entry.
* Fixme We need remove this field to use only Quality network selection status only
* @see Status
*/
public int status;
@@ -225,8 +225,8 @@ public class WifiConfiguration implements Parcelable {
/**
* The network's SSID. Can either be an ASCII string,
* which must be enclosed in double quotation marks
* (e.g., {@code "MyNetwork"}, or a string of
* hex digits,which are not enclosed in quotes
* (e.g., {@code "MyNetwork"}), or a string of
* hex digits, which are not enclosed in quotes
* (e.g., {@code 01a243f405}).
*/
public String SSID;
@@ -275,9 +275,10 @@ public class WifiConfiguration implements Parcelable {
* string otherwise.
*/
public String preSharedKey;
/**
* Up to four WEP keys. Either an ASCII string enclosed in double
* quotation marks (e.g., {@code "abcdef"} or a string
* quotation marks (e.g., {@code "abcdef"}) or a string
* of hex digits (e.g., {@code 0102030405}).
* <p/>
* When the value of one of these keys is read, the actual key is