Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3bc40c71 authored by Michael Plass's avatar Michael Plass Committed by android-build-merger
Browse files

Merge "Merge "Document WifiManager.getConnectionInfo permission" into... 

Merge "Merge "Document WifiManager.getConnectionInfo permission" into oc-mr1-dev am: 46b2968f" into oc-mr1-dev-plus-aosp
am: 4dac5a76

Change-Id: I9d7a8a13c3285bc3b78e65572378a84398e795bc
parents 55489952 4dac5a76

wifi/java/android/net/wifi/WifiInfo.java

+2 −1
Original line number Diff line number Diff line
@@ -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() {

wifi/java/android/net/wifi/WifiManager.java

+8 −2
Original line number Diff line number Diff line
@@ -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 {