From 2e4185e08cc55567d014457737f9643ac2a8f233 Mon Sep 17 00:00:00 2001
From: Jimi Chen <jimictw@google.com>
Date: Thu, 19 Jun 2025 13:14:40 +0000
Subject: [PATCH] Skip tests if device does not suppor telephony subscription
 feature

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
---
 .../android/net/ConnectivitySettingsManagerTest.kt    | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/tests/common/java/android/net/ConnectivitySettingsManagerTest.kt b/tests/common/java/android/net/ConnectivitySettingsManagerTest.kt
index 24e5c5ea4c..ae468b0fa1 100644
--- a/tests/common/java/android/net/ConnectivitySettingsManagerTest.kt
+++ b/tests/common/java/android/net/ConnectivitySettingsManagerTest.kt
@@ -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 {