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

Merge "Use Q permission on Q for startCaptivePortalApp" am: efcc79f2a5

Browse Source 
Change-Id: I7985ae613e89e7376555c3ba3d53d075ffc71596
This commit is contained in:
Remi NGUYEN VAN
2020-05-26 00:26:35 +00:00
committed by Automerger Merge Worker
parent 1d4d950451 efcc79f2a5
commit 3742699f21
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
tests/cts/net/src/android/net/cts/CaptivePortalTest.kt
View File

@@ -16,6 +16,7 @@
package android.net.cts package android.net.cts
import android.Manifest.permission.CONNECTIVITY_INTERNAL
import android.Manifest.permission.NETWORK_SETTINGS import android.Manifest.permission.NETWORK_SETTINGS
import android.Manifest.permission.READ_DEVICE_CONFIG import android.Manifest.permission.READ_DEVICE_CONFIG
import android.Manifest.permission.WRITE_DEVICE_CONFIG import android.Manifest.permission.WRITE_DEVICE_CONFIG
@@ -31,6 +32,7 @@ import android.net.NetworkRequest
import android.net.Uri import android.net.Uri
import android.net.cts.util.CtsNetUtils import android.net.cts.util.CtsNetUtils
import android.net.wifi.WifiManager import android.net.wifi.WifiManager
import android.os.Build
import android.os.ConditionVariable import android.os.ConditionVariable
import android.platform.test.annotations.AppModeFull import android.platform.test.annotations.AppModeFull
import android.provider.DeviceConfig import android.provider.DeviceConfig
@@ -164,7 +166,10 @@ class CaptivePortalTest {
"access." "access."
assertNotEquals(network, cm.activeNetwork, wifiDefaultMessage) assertNotEquals(network, cm.activeNetwork, wifiDefaultMessage)
doAsShell(NETWORK_SETTINGS) { cm.startCaptivePortalApp(network) } val startPortalAppPermission =
if (Build.VERSION.SDK_INT == Build.VERSION_CODES.Q) CONNECTIVITY_INTERNAL
else NETWORK_SETTINGS
doAsShell(startPortalAppPermission) { cm.startCaptivePortalApp(network) }
assertTrue(portalContentRequestCv.block(TEST_TIMEOUT_MS), "The captive portal login " + assertTrue(portalContentRequestCv.block(TEST_TIMEOUT_MS), "The captive portal login " +
"page was still not fetched ${TEST_TIMEOUT_MS}ms after startCaptivePortalApp.") "page was still not fetched ${TEST_TIMEOUT_MS}ms after startCaptivePortalApp.")