LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Use CONNECTIVITY_INTERNAL on Q for portal URL"

Browse Source
This commit is contained in:
Treehugger Robot
2020-11-12 05:35:20 +00:00
committed by Gerrit Code Review
parent 862c8a1ea0 78cb3a9de0
commit 2a7cf08b8e
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tests/cts/net/src/android/net/cts/ConnectivityManagerTest.java
View File

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