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

Commit 868d3ece authored by Chiachang Wang's avatar Chiachang Wang Committed by Automerger Merge Worker
Browse files

Merge "Expose constants of ConnectivityManager" into sc-dev am: e03f1097 

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

Change-Id: I10402a73d2e14bb4f0740b1d2e02f1b9fb990f10
parents 1fce50c5 e03f1097

packages/Connectivity/framework/api/module-lib-current.txt

+3 −0
Original line number Diff line number Diff line
@@ -20,6 +20,9 @@ package android.net { 
    method @RequiresPermission(android.Manifest.permission.NETWORK_STACK) public void setProfileNetworkPreference(@NonNull android.os.UserHandle, int, @Nullable java.util.concurrent.Executor, @Nullable Runnable);

    method @RequiresPermission(anyOf={android.Manifest.permission.MANAGE_TEST_NETWORKS, android.Manifest.permission.NETWORK_STACK}) public void simulateDataStall(int, long, @NonNull android.net.Network, @NonNull android.os.PersistableBundle);

    method public void systemReady();

    field public static final String ACTION_PROMPT_LOST_VALIDATION = "android.net.action.PROMPT_LOST_VALIDATION";

    field public static final String ACTION_PROMPT_PARTIAL_CONNECTIVITY = "android.net.action.PROMPT_PARTIAL_CONNECTIVITY";

    field public static final String ACTION_PROMPT_UNVALIDATED = "android.net.action.PROMPT_UNVALIDATED";

    field public static final String PRIVATE_DNS_MODE_OFF = "off";

    field public static final String PRIVATE_DNS_MODE_OPPORTUNISTIC = "opportunistic";

    field public static final String PRIVATE_DNS_MODE_PROVIDER_HOSTNAME = "hostname";

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

+6 −3
Original line number Diff line number Diff line
@@ -424,7 +424,8 @@ public class ConnectivityManager { 
     *

     * @hide

     */

    public static final String ACTION_PROMPT_UNVALIDATED = "android.net.conn.PROMPT_UNVALIDATED";

    @SystemApi(client = MODULE_LIBRARIES)

    public static final String ACTION_PROMPT_UNVALIDATED = "android.net.action.PROMPT_UNVALIDATED";



    /**

     * Action used to display a dialog that asks the user whether to avoid a network that is no
@@ -432,8 +433,9 @@ public class ConnectivityManager { 
     *

     * @hide

     */

    @SystemApi(client = MODULE_LIBRARIES)

    public static final String ACTION_PROMPT_LOST_VALIDATION =

            "android.net.conn.PROMPT_LOST_VALIDATION";

            "android.net.action.PROMPT_LOST_VALIDATION";



    /**

     * Action used to display a dialog that asks the user whether to stay connected to a network
@@ -442,8 +444,9 @@ public class ConnectivityManager { 
     *

     * @hide

     */

    @SystemApi(client = MODULE_LIBRARIES)

    public static final String ACTION_PROMPT_PARTIAL_CONNECTIVITY =

            "android.net.conn.PROMPT_PARTIAL_CONNECTIVITY";

            "android.net.action.PROMPT_PARTIAL_CONNECTIVITY";



    /**

     * Invalid tethering type.