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: Id6b542ca141ee2b06a6b082277fda333bd0bf8cf
This commit is contained in:
@@ -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 =
|
||||
|
||||
Reference in New Issue
Block a user