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

Commit 68a69cc6 authored by lucaslin's avatar lucaslin Committed by Chiachang Wang
Browse files

Expose constants of ConnectivityManager 

The callers cannot call the hidden APIs after ConnectivityManager
became a part of mainline module, so expose them for callers.
Also change the value of ACTION_PROMPT_PARTIAL_CONNECTIVITY,
ACTION_PROMPT_LOST_VALIDATION and ACTION_PROMPT_UNVALIDATED because
of API lint errors.

Bug: 172183305
Test: Check private DNS settings is normal, and test NO_INTERNET
      notification can be shown normally.
Change-Id: I715c766ad8e5eb54f4dc67239c1dbca7239506fc
Merged-In: I715c766ad8e5eb54f4dc67239c1dbca7239506fc
parent bc3fff46

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

+3 −0
Original line number Diff line number Diff line
@@ -26,6 +26,9 @@ package android.net { 
    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 @RequiresPermission(anyOf={android.Manifest.permission.NETWORK_SETTINGS, android.Manifest.permission.NETWORK_STACK, android.net.NetworkStack.PERMISSION_MAINLINE_NETWORK_STACK}) public void startCaptivePortalApp(@NonNull android.net.Network);

    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 int BLOCKED_METERED_REASON_ADMIN_DISABLED = 262144; // 0x40000

    field public static final int BLOCKED_METERED_REASON_DATA_SAVER = 65536; // 0x10000

    field public static final int BLOCKED_METERED_REASON_MASK = -65536; // 0xffff0000

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

+6 −3
Original line number Diff line number Diff line
@@ -425,7 +425,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
@@ -433,8 +434,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
@@ -443,8 +445,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.