summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Treehugger Robot <treehugger-gerrit@google.com> 2021-04-21 09:19:13 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2021-04-21 09:19:13 +0000
commita9b3e555a8e238f2c0dd3c83009c3d486bc4e881 (patch)
tree519f9161824375b1013d79dbf80fdcbfe04a39f6
parente57774df6ced4cb52df55ffe5f1cb0ff202fbd64 (diff)
parent52a8119c664e051f48c5f390090b5b7d768a7081 (diff)
Merge "Add the related extra information in the javadoc" am: aaf353b24c am: 8000286ede am: 52a8119c66
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1681465 Change-Id: I9eb3c2543787a91f211be5eb7b92b66fe696489f
-rw-r--r--packages/Connectivity/framework/src/android/net/ConnectivityManager.java11
1 files changed, 11 insertions, 0 deletions
diff --git a/packages/Connectivity/framework/src/android/net/ConnectivityManager.java b/packages/Connectivity/framework/src/android/net/ConnectivityManager.java
index b3c199772554..5dfa93226dff 100644
--- a/packages/Connectivity/framework/src/android/net/ConnectivityManager.java
+++ b/packages/Connectivity/framework/src/android/net/ConnectivityManager.java
@@ -424,6 +424,9 @@ public class ConnectivityManager {
* Action used to display a dialog that asks the user whether to connect to a network that is
* not validated. This intent is used to start the dialog in settings via startActivity.
*
+ * This action includes a {@link Network} typed extra which is called
+ * {@link ConnectivityManager#EXTRA_NETWORK} that represents the network which is unvalidated.
+ *
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
@@ -433,6 +436,10 @@ public class ConnectivityManager {
* Action used to display a dialog that asks the user whether to avoid a network that is no
* longer validated. This intent is used to start the dialog in settings via startActivity.
*
+ * This action includes a {@link Network} typed extra which is called
+ * {@link ConnectivityManager#EXTRA_NETWORK} that represents the network which is no longer
+ * validated.
+ *
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
@@ -444,6 +451,10 @@ public class ConnectivityManager {
* that has not validated. This intent is used to start the dialog in settings via
* startActivity.
*
+ * This action includes a {@link Network} typed extra which is called
+ * {@link ConnectivityManager#EXTRA_NETWORK} that represents the network which has partial
+ * connectivity.
+ *
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)