From 78cb3a9de0a86eea96a070d2d6eeea5cf1adfffb Mon Sep 17 00:00:00 2001 From: Remi NGUYEN VAN Date: Fri, 6 Nov 2020 16:14:37 +0900 Subject: [PATCH] Use CONNECTIVITY_INTERNAL on Q for portal URL getCaptivePortalServerUrl requires CONNECTIVITY_INTERNAL or MAINLINE_NETWORK_STACK on Q, and NETWORK_SETTINGS or MAINLINE_NETWORK_STACK on R+. Use CONNECTIVITY_INTERNAL on Q instead of NETWORK_SETTINGS to test it. Bug: 172626873 Test: atest CtsNetTestCasesLatestSdk:ConnectivityManagerTest Change-Id: I03309de945b198ad9b40d51d799d2619bb3179ea --- .../net/src/android/net/cts/ConnectivityManagerTest.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/tests/cts/net/src/android/net/cts/ConnectivityManagerTest.java b/tests/cts/net/src/android/net/cts/ConnectivityManagerTest.java index db4e3e744a..cbf43e7b63 100644 --- a/tests/cts/net/src/android/net/cts/ConnectivityManagerTest.java +++ b/tests/cts/net/src/android/net/cts/ConnectivityManagerTest.java @@ -16,6 +16,7 @@ package android.net.cts; +import static android.Manifest.permission.CONNECTIVITY_INTERNAL; import static android.Manifest.permission.CONNECTIVITY_USE_RESTRICTED_NETWORKS; import static android.Manifest.permission.NETWORK_SETTINGS; import static android.content.pm.PackageManager.FEATURE_ETHERNET; @@ -1517,7 +1518,10 @@ public class ConnectivityManagerTest { @Test public void testGetCaptivePortalServerUrl() { - final String url = runAsShell(NETWORK_SETTINGS, mCm::getCaptivePortalServerUrl); + final String permission = Build.VERSION.SDK_INT <= Build.VERSION_CODES.Q + ? CONNECTIVITY_INTERNAL + : NETWORK_SETTINGS; + final String url = runAsShell(permission, mCm::getCaptivePortalServerUrl); assertNotNull("getCaptivePortalServerUrl must not be null", url); try { final URL parsedUrl = new URL(url);