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

Commit 1cd0e8f0 authored by Chiachang Wang's avatar Chiachang Wang Committed by Automerger Merge Worker
Browse files

Merge "Add startCaptivePortalApp to system API" am: b53aeb46 

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

Change-Id: I2efbc3276ccce8df4d77c06dc2d50bd4d2bed9b5
parents 4247c39c b53aeb46

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

+1 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ package android.net { 
    method @RequiresPermission(android.Manifest.permission.NETWORK_STACK) public void setGlobalProxy(@Nullable android.net.ProxyInfo);

    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 @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 PRIVATE_DNS_MODE_OFF = "off";

    field public static final String PRIVATE_DNS_MODE_OPPORTUNISTIC = "opportunistic";

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

+10 −2
Original line number Diff line number Diff line
@@ -4461,12 +4461,20 @@ public class ConnectivityManager { 
    /**

     * Requests that the system open the captive portal app on the specified network.

     *

     * <p>This is to be used on networks where a captive portal was detected, as per

     * {@link NetworkCapabilities#NET_CAPABILITY_CAPTIVE_PORTAL}.

     *

     * @param network The network to log into.

     *

     * @hide

     */

    @RequiresPermission(android.Manifest.permission.NETWORK_SETTINGS)

    public void startCaptivePortalApp(Network network) {

    @SystemApi(client = SystemApi.Client.MODULE_LIBRARIES)

    @RequiresPermission(anyOf = {

            android.Manifest.permission.NETWORK_SETTINGS,

            android.Manifest.permission.NETWORK_STACK,

            NetworkStack.PERMISSION_MAINLINE_NETWORK_STACK

    })

    public void startCaptivePortalApp(@NonNull Network network) {

        try {

            mService.startCaptivePortalApp(network);

        } catch (RemoteException e) {