joy/android_packages_modules_Connectivity
Watch
1
Fork
You've already forked android_packages_modules_Connectivity
 0
Code Issues Pull requests Projects Releases Wiki Activity

Skip tests if device does not suppor telephony subscription feature

Browse source 
Flag: EXEMPT mainline
Test: atest CtsNetTestCases:android.net.ConnectivitySettingsManagerTest#testShouldShowAvoidBadWifiToggleWithCarrierConfig \
 -- --test-arg com.android.testutils.ConnectivityTestTargetPreparer:ignore-mobile-data-check:true \
 --abi arm64-v8a
Change-Id: Ifeb04dc02075f4a40422b3caaef3e8eab57f1096
This commit is contained in:
Jimi Chen 2025-06-19 13:14:40 +00:00
commit 2e4185e08c
1 changed files with 11 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

11
tests/common/java/android/net/ConnectivitySettingsManagerTest.kt
View file

@ -16,6 +16,7 @@
package android.net
import android.content.pm.PackageManager
import android.net.ConnectivitySettingsManager.CAPTIVE_PORTAL_MODE
import android.net.ConnectivitySettingsManager.CAPTIVE_PORTAL_MODE_AVOID
import android.net.ConnectivitySettingsManager.CAPTIVE_PORTAL_MODE_IGNORE
@ -91,6 +92,7 @@ import junit.framework.Assert.assertEquals
import junit.framework.Assert.assertFalse
import junit.framework.Assert.assertTrue
import kotlin.test.assertFailsWith
import org.junit.Assume.assumeTrue
import org.junit.Rule
import org.junit.Test
import org.junit.runner.RunWith
@ -581,6 +583,11 @@ class ConnectivitySettingsManagerTest {
@Test
@IgnoreUpTo(Build.VERSION_CODES.BAKLAVA)
fun testGetNetworkAvoidBadWifiWithCarrierConfig() {
assumeTrue(
"skip test if device does not support telephony subscription feature",
context.packageManager.hasSystemFeature(PackageManager.FEATURE_TELEPHONY_SUBSCRIPTION)
)
val orgCarrierAwareSetting = getNetworkAvoidBadWifiSetting(context, defaultSubId)
val orgSetting = getNetworkLegacyGlobalAvoidBadWifiSetting(context)
try {
@ -645,6 +652,10 @@ class ConnectivitySettingsManagerTest {
@Test
@IgnoreUpTo(Build.VERSION_CODES.BAKLAVA)
fun testShouldShowAvoidBadWifiToggleWithCarrierConfig() {
assumeTrue(
"skip test if device does not support telephony subscription feature",
context.packageManager.hasSystemFeature(PackageManager.FEATURE_TELEPHONY_SUBSCRIPTION)
)
val orgCarrierAwareSetting = getNetworkAvoidBadWifiSetting(context, defaultSubId)
val orgSetting = getNetworkLegacyGlobalAvoidBadWifiSetting(context)
try {