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

Merge "ScanResult: add clarifying comments to |flags| and |capabilities| fields" into nyc-dev

Browse Source
This commit is contained in:
Samuel Tan
2016-03-24 17:46:20 +00:00
committed by Android (Google) Code Review
parent d1ceef09a7 40b5617e15
commit a70cbf7f9c
1 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -56,6 +56,11 @@ public class ScanResult implements Parcelable {
*/ */
public int anqpDomainId; public int anqpDomainId;
/*
* This field is equivalent to the |flags|, rather than the |capabilities| field
* of the per-BSS scan results returned by WPA supplicant. See the definition of
* |struct wpa_bss| in wpa_supplicant/bss.h for more details.
*/
/** /**
* Describes the authentication, key management, and encryption schemes * Describes the authentication, key management, and encryption schemes
* supported by the access point. * supported by the access point.
@@ -211,6 +216,10 @@ public class ScanResult implements Parcelable {
/** {@hide} */ /** {@hide} */
public static final long FLAG_80211mc_RESPONDER = 0x0000000000000002; public static final long FLAG_80211mc_RESPONDER = 0x0000000000000002;
/*
* These flags are specific to the ScanResult class, and are not related to the |flags|
* field of the per-BSS scan results from WPA supplicant.
*/
/** /**
* Defines flags; such as {@link #FLAG_PASSPOINT_NETWORK}. * Defines flags; such as {@link #FLAG_PASSPOINT_NETWORK}.
* {@hide} * {@hide}