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

Merge "Document WifiManager.getConnectionInfo permission" into oc-mr1-dev

Browse Source 
am: 46b2968ff9

Change-Id: I5503d3cc37c2371e86430bab1897d87f702c748f
This commit is contained in:
Michael Plass
2017-08-01 02:14:37 +00:00
committed by android-build-merger
parent 700adfd161 46b2968ff9
commit abbcc0f4c7
2 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
wifi/java/android/net/wifi/WifiInfo.java
View File

@@ -345,7 +345,8 @@ public class WifiInfo implements Parcelable {
* Returns the service set identifier (SSID) of the current 802.11 network.
* If the SSID can be decoded as UTF-8, it will be returned surrounded by double
* quotation marks. Otherwise, it is returned as a string of hex digits. The
* SSID may be <unknown ssid> if there is no network currently connected.
* SSID may be <unknown ssid> if there is no network currently connected,
* or if the caller has insufficient permissions to access the SSID.
* @return the SSID
*/
public String getSSID() {

10
wifi/java/android/net/wifi/WifiManager.java
View File

@@ -1633,6 +1633,12 @@ public class WifiManager {
/**
* Return dynamic information about the current Wi-Fi connection, if any is active.
* <p>
* In the connected state, access to the SSID and BSSID requires
* the same permissions as {@link #getScanResults}. If such access is not allowed,
* {@link WifiInfo#getSSID} will return {@code "<unknown ssid>"} and
* {@link WifiInfo#getBSSID} will return {@code "02:00:00:00:00:00"}.
*
* @return the Wi-Fi information, contained in {@link WifiInfo}.
*/
public WifiInfo getConnectionInfo() {
@@ -2330,7 +2336,7 @@ public class WifiManager {
/** WPS start succeeded */
public abstract void onStarted(String pin);
/** WPS operation completed succesfully */
/** WPS operation completed successfully */
public abstract void onSucceeded();
/**
@@ -3213,7 +3219,7 @@ public class WifiManager {
* Normally the Wifi stack filters out packets not explicitly
* addressed to this device. Acquring a MulticastLock will
* cause the stack to receive packets addressed to multicast
* addresses. Processing these extra packets can cause a noticable
* addresses. Processing these extra packets can cause a noticeable
* battery drain and should be disabled when not needed.
*/
public class MulticastLock {