From 75ba4e7873ee1bb59685c56ea183445c0a8459a2 Mon Sep 17 00:00:00 2001 From: lucaslin Date: Mon, 26 Apr 2021 14:51:39 +0800 Subject: [PATCH] Define PRIVATE_DNS_MODE_OPPORTUNISTIC locally The type of ConnectivityManager#PRIVATE_DNS_MODE_OPPORTUNISTIC has changed from String to int, but the String definition is still needed to update to Settings.Global.PRIVATE_DNS_MODE, so the simplest way is to define one locally. Bug: 185311744 Test: atest CtsNetTestCases Change-Id: Iafcd861714d8aca44cede658ed630f9d5afd5e59 Ignore-AOSP-First: In the same TOPIC, there is a merge conflict in DevicePolicyManagerService.java in the internal branch, so it's needed to merge the code into internal branch to fix the merge conflict. --- tests/cts/net/util/java/android/net/cts/util/CtsNetUtils.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/cts/net/util/java/android/net/cts/util/CtsNetUtils.java b/tests/cts/net/util/java/android/net/cts/util/CtsNetUtils.java index 88172d7540..d5a26c4f62 100644 --- a/tests/cts/net/util/java/android/net/cts/util/CtsNetUtils.java +++ b/tests/cts/net/util/java/android/net/cts/util/CtsNetUtils.java @@ -18,7 +18,6 @@ package android.net.cts.util; import static android.Manifest.permission.ACCESS_WIFI_STATE; import static android.Manifest.permission.NETWORK_SETTINGS; -import static android.net.ConnectivityManager.PRIVATE_DNS_MODE_OPPORTUNISTIC; import static android.net.NetworkCapabilities.NET_CAPABILITY_INTERNET; import static android.net.NetworkCapabilities.TRANSPORT_CELLULAR; import static android.net.NetworkCapabilities.TRANSPORT_TEST; @@ -87,6 +86,7 @@ public final class CtsNetUtils { private static final int PRIVATE_DNS_SETTING_TIMEOUT_MS = 10_000; private static final int CONNECTIVITY_CHANGE_TIMEOUT_SECS = 30; + private static final String PRIVATE_DNS_MODE_OPPORTUNISTIC = "opportunistic"; public static final int HTTP_PORT = 80; public static final String TEST_HOST = "connectivitycheck.gstatic.com"; public static final String HTTP_REQUEST =