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

Commit ba8d6d9d authored by Paul Hu's avatar Paul Hu Committed by Automerger Merge Worker
Browse files

Merge "Add PRIVATE_DNS_MODE setting setter" into sc-dev am: f02ab425 

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

Change-Id: I6dc090af2b4b7fff144bfd5406ee2d3bd1966056
parents c0431443 f02ab425

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

+1 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ package android.net { 
    method @RequiresPermission(anyOf={android.Manifest.permission.NETWORK_SETTINGS, android.Manifest.permission.NETWORK_SETUP_WIZARD, android.Manifest.permission.NETWORK_STACK, android.net.NetworkStack.PERMISSION_MAINLINE_NETWORK_STACK}) public void setAvoidUnvalidated(@NonNull android.net.Network);

    method @RequiresPermission(android.Manifest.permission.NETWORK_STACK) public void setGlobalProxy(@Nullable android.net.ProxyInfo);

    method @RequiresPermission(anyOf={android.net.NetworkStack.PERMISSION_MAINLINE_NETWORK_STACK, android.Manifest.permission.NETWORK_STACK, android.Manifest.permission.NETWORK_SETTINGS}) public void setLegacyLockdownVpnEnabled(boolean);

    method public static void setPrivateDnsMode(@NonNull android.content.Context, @NonNull String);

    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.net.NetworkStack.PERMISSION_MAINLINE_NETWORK_STACK, android.Manifest.permission.NETWORK_STACK, android.Manifest.permission.NETWORK_SETTINGS}) public void setRequireVpnForUids(boolean, @NonNull java.util.Collection<android.util.Range<java.lang.Integer>>);

    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);

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

+19 −0
Original line number Diff line number Diff line
@@ -5427,4 +5427,23 @@ public class ConnectivityManager { 
        if (TextUtils.isEmpty(mode)) mode = PRIVATE_DNS_MODE_OPPORTUNISTIC;

        return mode;

    }



    /**

     * Set private DNS mode to settings.

     *

     * @param context The {@link Context} to set the private DNS mode.

     * @param mode The private dns mode. This should be one of the PRIVATE_DNS_MODE_* constants.

     *

     * @hide

     */

    @SystemApi(client = MODULE_LIBRARIES)

    public static void setPrivateDnsMode(@NonNull Context context,

            @NonNull @PrivateDnsMode String mode) {

        if (!(mode == PRIVATE_DNS_MODE_OFF

                || mode == PRIVATE_DNS_MODE_OPPORTUNISTIC

                || mode == PRIVATE_DNS_MODE_PROVIDER_HOSTNAME)) {

            throw new IllegalArgumentException("Invalid private dns mode");

        }

        Settings.Global.putString(context.getContentResolver(), PRIVATE_DNS_MODE, mode);

    }

}