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 FLAG_AVOID_BAD_WIFI_FROM_CARRIER_CONFIG is not enabled

Browse source 
Flag: android.net.platform.flags.avoid_bad_wifi_from_carrier_config
Bug: 424707713
Test: TH
Change-Id: I3253e95c92ff9001c73304e23ea829aa7f30f92f
This commit is contained in:
Jimi Chen 2025-06-24 13:27:02 +00:00
commit f8264fbf26
1 changed files with 14 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -66,9 +66,13 @@ import android.net.ConnectivitySettingsManager.setPrivateDnsDefaultMode
import android.net.ConnectivitySettingsManager.setWifiAlwaysRequested
import android.net.ConnectivitySettingsManager.setWifiDataActivityTimeout
import android.net.ConnectivitySettingsManager.shouldShowAvoidBadWifiToggle
import android.net.platform.flags.Flags
import android.os.Build
import android.os.PersistableBundle
import android.platform.test.annotations.AppModeFull
import android.platform.test.annotations.RequiresFlagsEnabled
import android.platform.test.flag.junit.CheckFlagsRule
import android.platform.test.flag.junit.DeviceFlagsValueProvider
import android.provider.Settings
import android.telephony.CarrierConfigManager
import android.telephony.SubscriptionManager
@ -201,6 +205,9 @@ class ConnectivitySettingsManagerTest {
@get:Rule
val ignoreRule = DevSdkIgnoreRule()
@get:Rule
val checkFlagsRule: CheckFlagsRule = DeviceFlagsValueProvider.createCheckFlagsRule()!!
@Test
fun testMobileDataActivityTimeout() {
testIntSetting(
@ -413,6 +420,7 @@ class ConnectivitySettingsManagerTest {
@Test
@IgnoreUpTo(Build.VERSION_CODES.BAKLAVA)
@RequiresFlagsEnabled(Flags.FLAG_AVOID_BAD_WIFI_FROM_CARRIER_CONFIG)
fun testSetNetworkAvoidBadWifiWithSettings() {
val testSubId = 1000
val orgDefaultSubIdSetting = getNetworkAvoidBadWifiSetting(context, defaultSubId)
@ -536,6 +544,7 @@ class ConnectivitySettingsManagerTest {
@Test
@IgnoreUpTo(Build.VERSION_CODES.BAKLAVA)
@RequiresFlagsEnabled(Flags.FLAG_AVOID_BAD_WIFI_FROM_CARRIER_CONFIG)
fun testGetNetworkAvoidBadWifiWithCarrierAwareSettings() {
val original = getNetworkAvoidBadWifiSetting(context, defaultSubId)
try {
@ -555,6 +564,7 @@ class ConnectivitySettingsManagerTest {
@Test
@IgnoreUpTo(Build.VERSION_CODES.BAKLAVA)
@RequiresFlagsEnabled(Flags.FLAG_AVOID_BAD_WIFI_FROM_CARRIER_CONFIG)
fun testGetNetworkAvoidBadWifiWithSettings() {
val orgCarrierAwareSetting = getNetworkAvoidBadWifiSetting(context, defaultSubId)
val orgSetting = getNetworkLegacyGlobalAvoidBadWifiSetting(context)
@ -582,6 +592,7 @@ class ConnectivitySettingsManagerTest {
@Test
@IgnoreUpTo(Build.VERSION_CODES.BAKLAVA)
@RequiresFlagsEnabled(Flags.FLAG_AVOID_BAD_WIFI_FROM_CARRIER_CONFIG)
fun testGetNetworkAvoidBadWifiWithCarrierConfig() {
assumeTrue(
"skip test if device does not support telephony subscription feature",
@ -615,6 +626,7 @@ class ConnectivitySettingsManagerTest {
@Test
@IgnoreUpTo(Build.VERSION_CODES.BAKLAVA)
@RequiresFlagsEnabled(Flags.FLAG_AVOID_BAD_WIFI_FROM_CARRIER_CONFIG)
fun testShouldShowAvoidBadWifiToggleWithSettings() {
val orgCarrierAwareSetting = getNetworkAvoidBadWifiSetting(context, defaultSubId)
val orgSetting = getNetworkLegacyGlobalAvoidBadWifiSetting(context)
@ -651,6 +663,7 @@ class ConnectivitySettingsManagerTest {
@Test
@IgnoreUpTo(Build.VERSION_CODES.BAKLAVA)
@RequiresFlagsEnabled(Flags.FLAG_AVOID_BAD_WIFI_FROM_CARRIER_CONFIG)
fun testShouldShowAvoidBadWifiToggleWithCarrierConfig() {
assumeTrue(
"skip test if device does not support telephony subscription feature",