summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author TreeHugger Robot <treehugger-gerrit@google.com> 2019-11-19 01:28:42 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2019-11-19 01:28:42 +0000
commita3f338f126a9780f3ec2ac320578e9571b158ce9 (patch)
tree954dee0bb2fd0bab9b181fa153439fedac3b8684
parentce934c7d78819d28c5e33bc78859b9ccfc0d98ed (diff)
parent68d08c6c487518652a0a48a6abffb674ebf0cb83 (diff)
Merge "Document permission & broadcast semantics re wifi state"
-rw-r--r--wifi/java/android/net/wifi/WifiManager.java12
1 files changed, 10 insertions, 2 deletions
diff --git a/wifi/java/android/net/wifi/WifiManager.java b/wifi/java/android/net/wifi/WifiManager.java
index 8482b069616d..16cb964901bf 100644
--- a/wifi/java/android/net/wifi/WifiManager.java
+++ b/wifi/java/android/net/wifi/WifiManager.java
@@ -450,7 +450,11 @@ public class WifiManager {
/**
* Broadcast intent action indicating that Wi-Fi has been enabled, disabled,
* enabling, disabling, or unknown. One extra provides this state as an int.
- * Another extra provides the previous state, if available.
+ * Another extra provides the previous state, if available. No network-related
+ * permissions are required to subscribe to this broadcast.
+ *
+ * <p class="note">This broadcast is not delivered to manifest receivers in
+ * applications that target API version 26 or later.
*
* @see #EXTRA_WIFI_STATE
* @see #EXTRA_PREVIOUS_WIFI_STATE
@@ -753,7 +757,11 @@ public class WifiManager {
/**
* Broadcast intent action indicating that the state of Wi-Fi connectivity
* has changed. An extra provides the new state
- * in the form of a {@link android.net.NetworkInfo} object.
+ * in the form of a {@link android.net.NetworkInfo} object. No network-related
+ * permissions are required to subscribe to this broadcast.
+ *
+ * <p class="note">This broadcast is not delivered to manifest receivers in
+ * applications that target API version 26 or later.
* @see #EXTRA_NETWORK_INFO
*/
@SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION)