summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTreehugger Robot <treehugger-gerrit@google.com>2021-04-21 08:28:23 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-04-21 08:28:23 +0000
commitdb0c8c32b11baf035a747d4577ce3e65de5e109f (patch)
tree03aa7223a84cff5ce67efd015b0b4baae22ffb2b
parent9c4a07f441827f4bfc32c3b278193e4c8ccd7ea5 (diff)
parentf78aabbf8214b46b9e517f735ad58745c172fcb8 (diff)
Merge "Add the related extra information in the javadoc" am: f78aabbf82
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1681465 Change-Id: I6ea797209d4d4118ffd28acba4dd419f56d90536
-rw-r--r--framework/src/android/net/ConnectivityManager.java11
1 files changed, 11 insertions, 0 deletions
diff --git a/framework/src/android/net/ConnectivityManager.java b/framework/src/android/net/ConnectivityManager.java
index 043ff383e7..4dd0984c79 100644
--- a/framework/src/android/net/ConnectivityManager.java
+++ b/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)