commit 97d4f168676dd1bd9b9a310d8f9cafa93cd0ad66
author Lucas Lin <lucaslin@google.com> Wed May 12 17:59:30 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed May 12 17:59:30 2021 +0000
tree 0b72e7827ac7cfeda93e255f6a0c6898094e19b3
parent 38bf66f05d5dffc709890bb30178d5b8005993f0
parent 71d233730c6c7b007241d1b5dcfe6d7c0f7d7278

Merge "Define PRIVATE_DNS_MODE_OPPORTUNISTIC locally" am: d56f4a700b am: 71d233730c

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1696705

Change-Id: Ifaea1630983078ee810f1d495d0d63fe9acd9d1b

tests/cts/net/util/java/android/net/cts/util/CtsNetUtils.java

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 88172d7..d5a26c4 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 @@
 
 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 @@
 
     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 =