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

Commit a9b3e555 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Add the related extra information in the javadoc" am: aaf353b2 am:... 

Merge "Add the related extra information in the javadoc" am: aaf353b2 am: 8000286e am: 52a8119c

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1681465

Change-Id: I9eb3c2543787a91f211be5eb7b92b66fe696489f
parents e57774df 52a8119c

packages/Connectivity/framework/src/android/net/ConnectivityManager.java

+11 −0
Original line number Diff line number Diff line
@@ -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)