From a66d27c488f44953fafcd50032c7bba8c913f903 Mon Sep 17 00:00:00 2001 From: Aleksander Morgado Date: Mon, 10 Feb 2025 16:03:59 +0000 Subject: [PATCH 1/8] Return UNSUPPORTED_ON_DEVICE in network/phonenumber when no telephony If the device does not have any telephony support (either via the build-time config_show_sim_info=false boolean flag, or when not declaring the PackageManager.FEATURE_TELEPHONY_DATA feature flag), returning UNSUPPORTED_ON_DEVICE makes more sense than CONDITIONALLY_UNAVAILABLE, as there is no runtime change that would make it available. This change also aligns the behavior with the deviceinfo/phonenumber entry. Bug: 395714454 Flag: EXEMPT bugfix Test: atest MobileNetworkPhoneNumberPreferenceControllerTest Change-Id: I5f2392969fad1884a89de3870ad37be5601fbe37 --- .../MobileNetworkPhoneNumberPreferenceController.kt | 6 +++--- .../MobileNetworkPhoneNumberPreferenceControllerTest.kt | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/com/android/settings/network/telephony/MobileNetworkPhoneNumberPreferenceController.kt b/src/com/android/settings/network/telephony/MobileNetworkPhoneNumberPreferenceController.kt index 40cb6f93ace..257c613164c 100644 --- a/src/com/android/settings/network/telephony/MobileNetworkPhoneNumberPreferenceController.kt +++ b/src/com/android/settings/network/telephony/MobileNetworkPhoneNumberPreferenceController.kt @@ -44,10 +44,10 @@ constructor( } override fun getAvailabilityStatus(subId: Int): Int = when { + !SubscriptionUtil.isSimHardwareVisible(mContext) + || Utils.isWifiOnly(mContext) -> UNSUPPORTED_ON_DEVICE !Flags.isDualSimOnboardingEnabled() - || !SubscriptionManager.isValidSubscriptionId(subId) - || !SubscriptionUtil.isSimHardwareVisible(mContext) - || Utils.isWifiOnly(mContext) -> CONDITIONALLY_UNAVAILABLE + || !SubscriptionManager.isValidSubscriptionId(subId) -> CONDITIONALLY_UNAVAILABLE !mContext.userManager.isAdminUser -> DISABLED_FOR_USER else -> AVAILABLE } diff --git a/tests/spa_unit/src/com/android/settings/network/telephony/MobileNetworkPhoneNumberPreferenceControllerTest.kt b/tests/spa_unit/src/com/android/settings/network/telephony/MobileNetworkPhoneNumberPreferenceControllerTest.kt index a46b71033b6..f9efa7d28f0 100644 --- a/tests/spa_unit/src/com/android/settings/network/telephony/MobileNetworkPhoneNumberPreferenceControllerTest.kt +++ b/tests/spa_unit/src/com/android/settings/network/telephony/MobileNetworkPhoneNumberPreferenceControllerTest.kt @@ -123,7 +123,7 @@ class MobileNetworkPhoneNumberPreferenceControllerTest { whenever(SubscriptionUtil.isSimHardwareVisible(context)).thenReturn(false) val availabilityStatus = controller.availabilityStatus - assertThat(availabilityStatus).isEqualTo(BasePreferenceController.CONDITIONALLY_UNAVAILABLE) + assertThat(availabilityStatus).isEqualTo(BasePreferenceController.UNSUPPORTED_ON_DEVICE) } @Test @@ -141,7 +141,7 @@ class MobileNetworkPhoneNumberPreferenceControllerTest { whenever(Utils.isWifiOnly(context)).thenReturn(true) val availabilityStatus = controller.availabilityStatus - assertThat(availabilityStatus).isEqualTo(BasePreferenceController.CONDITIONALLY_UNAVAILABLE) + assertThat(availabilityStatus).isEqualTo(BasePreferenceController.UNSUPPORTED_ON_DEVICE) } private companion object { From 4f4580e5f5588a10c4cc9d377bd69faa5b726732 Mon Sep 17 00:00:00 2001 From: Aleksander Morgado Date: Wed, 12 Feb 2025 11:01:09 +0000 Subject: [PATCH 2/8] Added unit tests for ImeiInfoPreferenceController visibility The new test checks whether the item is available when config_show_sim_info=false, when telephony is not data capable and when the user is not admin, The default visibility status for all tests is defined in the test setup(). Bug: 395714454 Flag: EXEMPT test only Test: atest ImeiInfoPreferenceControllerTest Change-Id: Ic4df12da216e5c343cf696d931ff02dc942d105f --- .../ImeiInfoPreferenceControllerTest.java | 46 +++++++++++++++++-- 1 file changed, 43 insertions(+), 3 deletions(-) diff --git a/tests/robotests/src/com/android/settings/deviceinfo/imei/ImeiInfoPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/imei/ImeiInfoPreferenceControllerTest.java index 96324fa5ccb..007bbb6b36a 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/imei/ImeiInfoPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/imei/ImeiInfoPreferenceControllerTest.java @@ -20,7 +20,7 @@ import static android.telephony.TelephonyManager.PHONE_TYPE_CDMA; import static android.telephony.TelephonyManager.PHONE_TYPE_GSM; import static android.telephony.TelephonyManager.PHONE_TYPE_NONE; -import static com.android.settings.core.BasePreferenceController.AVAILABLE; +import static com.google.common.truth.Truth.assertThat; import static org.mockito.ArgumentMatchers.anyBoolean; import static org.mockito.Mockito.anyInt; @@ -43,6 +43,7 @@ import androidx.preference.PreferenceCategory; import androidx.preference.PreferenceScreen; import com.android.settings.R; +import com.android.settings.core.BasePreferenceController; import com.android.settings.deviceinfo.simstatus.SlotSimStatus; import org.junit.Before; @@ -90,11 +91,15 @@ public class ImeiInfoPreferenceControllerTest { mResources = spy(mContext.getResources()); when(mContext.getResources()).thenReturn(mResources); - when(mResources.getBoolean(R.bool.config_show_sim_info)).thenReturn(true); mockService(Context.TELEPHONY_SERVICE, TelephonyManager.class, mTelephonyManager); mockService(Context.USER_SERVICE, UserManager.class, mUserManager); + // Availability defaults + when(mResources.getBoolean(R.bool.config_show_sim_info)).thenReturn(true); + when(mTelephonyManager.isDataCapable()).thenReturn(true); + when(mUserManager.isAdminUser()).thenReturn(true); + when(mScreen.getContext()).thenReturn(mContext); final String categoryKey = "device_detail_category"; when(mScreen.findPreference(categoryKey)).thenReturn(mCategory); @@ -109,7 +114,6 @@ public class ImeiInfoPreferenceControllerTest { } }); controller.init(mFragment, slotSimStatus); - doReturn(AVAILABLE).when(controller).getAvailabilityStatus(); doReturn(preference).when(controller).createNewPreference(mContext); when(mScreen.findPreference(key)).thenReturn(preference); @@ -228,6 +232,42 @@ public class ImeiInfoPreferenceControllerTest { verify(mFragment).getChildFragmentManager(); } + @Test + public void getAvailabilityStatus_showSimInfo_telephonyDataCapable_userAdmindisplayed() { + setupPhoneCount(1, PHONE_TYPE_GSM, PHONE_TYPE_NONE); + + // Use defaults + assertThat(mController.getAvailabilityStatus()).isEqualTo( + BasePreferenceController.AVAILABLE); + } + + @Test + public void getAvailabilityStatus_notShowSimInfo_telephonyDataCapable_userAdmin_notDisplayed() { + setupPhoneCount(1, PHONE_TYPE_GSM, PHONE_TYPE_NONE); + + when(mResources.getBoolean(R.bool.config_show_sim_info)).thenReturn(false); + assertThat(mController.getAvailabilityStatus()).isEqualTo( + BasePreferenceController.UNSUPPORTED_ON_DEVICE); + } + + @Test + public void getAvailabilityStatus_showSimInfo_notTelephonyDataCapable_userAdmin_notDisplayed() { + setupPhoneCount(1, PHONE_TYPE_GSM, PHONE_TYPE_NONE); + + when(mTelephonyManager.isDataCapable()).thenReturn(false); + assertThat(mController.getAvailabilityStatus()).isEqualTo( + BasePreferenceController.UNSUPPORTED_ON_DEVICE); + } + + @Test + public void getAvailabilityStatus_showSimInfo_telephonyDataCapable_notUserAdmin_notDisplayed() { + setupPhoneCount(1, PHONE_TYPE_GSM, PHONE_TYPE_NONE); + + when(mUserManager.isAdminUser()).thenReturn(false); + assertThat(mController.getAvailabilityStatus()).isEqualTo( + BasePreferenceController.UNSUPPORTED_ON_DEVICE); + } + private void mockService(String serviceName, Class serviceClass, T service) { when(mContext.getSystemServiceName(serviceClass)).thenReturn(serviceName); when(mContext.getSystemService(serviceName)).thenReturn(service); From dc866692987fc634584dc927c9731c6a85a6caba Mon Sep 17 00:00:00 2001 From: Aleksander Morgado Date: Wed, 12 Feb 2025 13:53:08 +0000 Subject: [PATCH 3/8] Added unit test for MobileNetworkImeiPreferenceController visibility The new test checks whether the item is available when the SubscriptionUtil.isSimHardwareVisible() method returns true, i.e. if the config_show_sim_info boolean flag is true on non-test runtime. The default visibility status for all tests is defined in the test setup() method. Bug: 395714454 Flag: EXEMPT test only Test: atest MobileNetworkImeiPreferenceControllerTest Change-Id: Iaa8be041f0299ac36d532ed68fdc9c30e5690b11 --- ...bileNetworkImeiPreferenceControllerTest.kt | 62 +++++++++++++++---- 1 file changed, 50 insertions(+), 12 deletions(-) diff --git a/tests/spa_unit/src/com/android/settings/network/telephony/MobileNetworkImeiPreferenceControllerTest.kt b/tests/spa_unit/src/com/android/settings/network/telephony/MobileNetworkImeiPreferenceControllerTest.kt index 1da8fd9d7f4..ce2e2827d30 100644 --- a/tests/spa_unit/src/com/android/settings/network/telephony/MobileNetworkImeiPreferenceControllerTest.kt +++ b/tests/spa_unit/src/com/android/settings/network/telephony/MobileNetworkImeiPreferenceControllerTest.kt @@ -17,6 +17,7 @@ package com.android.settings.network.telephony import android.content.Context +import android.os.UserManager import android.telephony.SubscriptionInfo import android.telephony.TelephonyManager import androidx.fragment.app.Fragment @@ -29,6 +30,7 @@ import com.android.settings.R import com.android.settings.core.BasePreferenceController import com.android.settings.network.SubscriptionInfoListViewModel import com.android.settings.network.SubscriptionUtil +import com.android.settingslib.Utils import com.google.common.truth.Truth.assertThat import kotlinx.coroutines.runBlocking import org.junit.After @@ -48,6 +50,8 @@ import org.mockito.quality.Strictness class MobileNetworkImeiPreferenceControllerTest { private lateinit var mockSession: MockitoSession + private val mockUserManager = mock() + private val mockViewModels = mock>() private val mockFragment = mock{ val viewmodel = mockViewModels @@ -66,6 +70,7 @@ class MobileNetworkImeiPreferenceControllerTest { private val context: Context = spy(ApplicationProvider.getApplicationContext()) { on { getSystemService(TelephonyManager::class.java) } doReturn mockTelephonyManager + on { getSystemService(UserManager::class.java) } doReturn mockUserManager } private val controller = MobileNetworkImeiPreferenceController(context, TEST_KEY) @@ -77,9 +82,17 @@ class MobileNetworkImeiPreferenceControllerTest { mockSession = ExtendedMockito.mockitoSession() .initMocks(this) .mockStatic(SubscriptionUtil::class.java) + .mockStatic(Utils::class.java) .strictness(Strictness.LENIENT) .startMocking() + // By default, available + whenever(SubscriptionUtil.isSimHardwareVisible(context)).thenReturn(true) + whenever(Utils.isWifiOnly(context)).thenReturn(false) + mockUserManager.stub { + on { isAdminUser } doReturn true + } + preferenceScreen.addPreference(preference) controller.displayPreference(preferenceScreen) } @@ -91,15 +104,13 @@ class MobileNetworkImeiPreferenceControllerTest { @Test fun refreshData_getImei_preferenceSummaryIsExpected() = runBlocking { - whenever(SubscriptionUtil.isSimHardwareVisible(context)).thenReturn(true) whenever(SubscriptionUtil.getActiveSubscriptions(any())).thenReturn( listOf( SUB_INFO_1, SUB_INFO_2 ) ) - var mockSubId = 2 - controller.init(mockFragment, mockSubId) + controller.init(mockFragment, SUB_ID_1) mockImei = "test imei" mockTelephonyManager.stub { on { imei } doReturn mockImei @@ -112,15 +123,13 @@ class MobileNetworkImeiPreferenceControllerTest { @Test fun refreshData_getImeiTitle_showImei() = runBlocking { - whenever(SubscriptionUtil.isSimHardwareVisible(context)).thenReturn(true) whenever(SubscriptionUtil.getActiveSubscriptions(any())).thenReturn( listOf( SUB_INFO_1, SUB_INFO_2 ) ) - var mockSubId = 2 - controller.init(mockFragment, mockSubId) + controller.init(mockFragment, SUB_ID_2) mockImei = "test imei" mockTelephonyManager.stub { on { imei } doReturn mockImei @@ -134,15 +143,13 @@ class MobileNetworkImeiPreferenceControllerTest { @Test fun refreshData_getPrimaryImeiTitle_showPrimaryImei() = runBlocking { - whenever(SubscriptionUtil.isSimHardwareVisible(context)).thenReturn(true) whenever(SubscriptionUtil.getActiveSubscriptions(any())).thenReturn( listOf( SUB_INFO_1, SUB_INFO_2 ) ) - var mockSubId = 2 - controller.init(mockFragment, mockSubId) + controller.init(mockFragment, SUB_ID_2) mockImei = "test imei" mockTelephonyManager.stub { on { imei } doReturn mockImei @@ -155,26 +162,57 @@ class MobileNetworkImeiPreferenceControllerTest { } @Test - fun getAvailabilityStatus_notSimHardwareVisible() { + fun getAvailabilityStatus_simHardwareVisible_userAdmin_notWifiOnly_displayed() { + controller.init(mockFragment, SUB_ID_1) + + // Use defaults from setup() + val availabilityStatus = controller.availabilityStatus + assertThat(availabilityStatus).isEqualTo(BasePreferenceController.AVAILABLE) + } + + @Test + fun getAvailabilityStatus_notSimHardwareVisible_userAdmin_notWifiOnly_notDisplayed() { + controller.init(mockFragment, SUB_ID_1) whenever(SubscriptionUtil.isSimHardwareVisible(context)).thenReturn(false) val availabilityStatus = controller.availabilityStatus + assertThat(availabilityStatus).isEqualTo(BasePreferenceController.CONDITIONALLY_UNAVAILABLE) + } + @Test + fun getAvailabilityStatus_simHardwareVisible_notUserAdmin_notWifiOnly_notDisplayed() { + controller.init(mockFragment, SUB_ID_1) + mockUserManager.stub { + on { isAdminUser } doReturn false + } + + val availabilityStatus = controller.availabilityStatus + assertThat(availabilityStatus).isEqualTo(BasePreferenceController.CONDITIONALLY_UNAVAILABLE) + } + + @Test + fun getAvailabilityStatus_simHardwareVisible_userAdmin_wifiOnly_notDisplayed() { + controller.init(mockFragment, SUB_ID_1) + whenever(Utils.isWifiOnly(context)).thenReturn(true) + + val availabilityStatus = controller.availabilityStatus assertThat(availabilityStatus).isEqualTo(BasePreferenceController.CONDITIONALLY_UNAVAILABLE) } private companion object { const val TEST_KEY = "test_key" + const val SUB_ID_1 = 1 + const val SUB_ID_2 = 2 const val DISPLAY_NAME_1 = "Sub 1" const val DISPLAY_NAME_2 = "Sub 2" val SUB_INFO_1: SubscriptionInfo = SubscriptionInfo.Builder().apply { - setId(1) + setId(SUB_ID_1) setDisplayName(DISPLAY_NAME_1) }.build() val SUB_INFO_2: SubscriptionInfo = SubscriptionInfo.Builder().apply { - setId(2) + setId(SUB_ID_2) setDisplayName(DISPLAY_NAME_2) }.build() From 2a0ad1efdfef072ad3d64a2bb634aae585337031 Mon Sep 17 00:00:00 2001 From: Aleksander Morgado Date: Wed, 12 Feb 2025 14:19:47 +0000 Subject: [PATCH 4/8] Return UNSUPPORTED_ON_DEVICE in network/imei when no telephony If the device does not have any telephony support (either via the build-time config_show_sim_info=false boolean flag, or when not declaring the PackageManager.FEATURE_TELEPHONY_DATA feature flag), returning UNSUPPORTED_ON_DEVICE makes more sense than CONDITIONALLY_UNAVAILABLE, as there is no runtime change that would make it available. This change also aligns the behavior with the deviceinfo/imei entry. Bug: 395714454 Flag: EXEMPT bugfix Test: atest MobileNetworkImeiPreferenceControllerTest Change-Id: Ia01cf3812f8343eabd8ea6970b691ac71432e8bd --- .../MobileNetworkImeiPreferenceController.kt | 12 ++++++------ .../MobileNetworkImeiPreferenceControllerTest.kt | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/com/android/settings/network/telephony/MobileNetworkImeiPreferenceController.kt b/src/com/android/settings/network/telephony/MobileNetworkImeiPreferenceController.kt index 6b3f903f803..79807ecd2e9 100644 --- a/src/com/android/settings/network/telephony/MobileNetworkImeiPreferenceController.kt +++ b/src/com/android/settings/network/telephony/MobileNetworkImeiPreferenceController.kt @@ -64,12 +64,12 @@ class MobileNetworkImeiPreferenceController(context: Context, key: String) : } override fun getAvailabilityStatus(subId: Int): Int = when { - !Flags.isDualSimOnboardingEnabled() -> CONDITIONALLY_UNAVAILABLE - SubscriptionManager.isValidSubscriptionId(subId) - && SubscriptionUtil.isSimHardwareVisible(mContext) - && mContext.userManager.isAdminUser - && !Utils.isWifiOnly(mContext) -> AVAILABLE - else -> CONDITIONALLY_UNAVAILABLE + !SubscriptionUtil.isSimHardwareVisible(mContext) + || Utils.isWifiOnly(mContext) -> UNSUPPORTED_ON_DEVICE + !Flags.isDualSimOnboardingEnabled() + || !SubscriptionManager.isValidSubscriptionId(subId) + || !mContext.userManager.isAdminUser -> CONDITIONALLY_UNAVAILABLE + else -> AVAILABLE } override fun displayPreference(screen: PreferenceScreen) { diff --git a/tests/spa_unit/src/com/android/settings/network/telephony/MobileNetworkImeiPreferenceControllerTest.kt b/tests/spa_unit/src/com/android/settings/network/telephony/MobileNetworkImeiPreferenceControllerTest.kt index ce2e2827d30..9d80d983107 100644 --- a/tests/spa_unit/src/com/android/settings/network/telephony/MobileNetworkImeiPreferenceControllerTest.kt +++ b/tests/spa_unit/src/com/android/settings/network/telephony/MobileNetworkImeiPreferenceControllerTest.kt @@ -176,7 +176,7 @@ class MobileNetworkImeiPreferenceControllerTest { whenever(SubscriptionUtil.isSimHardwareVisible(context)).thenReturn(false) val availabilityStatus = controller.availabilityStatus - assertThat(availabilityStatus).isEqualTo(BasePreferenceController.CONDITIONALLY_UNAVAILABLE) + assertThat(availabilityStatus).isEqualTo(BasePreferenceController.UNSUPPORTED_ON_DEVICE) } @Test @@ -196,7 +196,7 @@ class MobileNetworkImeiPreferenceControllerTest { whenever(Utils.isWifiOnly(context)).thenReturn(true) val availabilityStatus = controller.availabilityStatus - assertThat(availabilityStatus).isEqualTo(BasePreferenceController.CONDITIONALLY_UNAVAILABLE) + assertThat(availabilityStatus).isEqualTo(BasePreferenceController.UNSUPPORTED_ON_DEVICE) } private companion object { From 64fb695d9bb3c8baaf551d30d4cdacf5375bf408 Mon Sep 17 00:00:00 2001 From: Aleksander Morgado Date: Tue, 11 Feb 2025 22:01:40 +0000 Subject: [PATCH 5/8] Return DISABLED_FOR_USER in IMEI availability if not admin user The correct return when checking for the IMEI field availability for non-admin users is DISABLED_FOR_USER. UNSUPPORTED_ON_DEVICE should only be used when the setting is unconditionally hidden as the device does not support the feature. Bug: 395714454 Flag: EXEMPT bugfix Test: atest ImeiInfoPreferenceControllerTest Test: atest MobileNetworkImeiPreferenceControllerTest Change-Id: I4ee89a84953993daad539d33d3a2e576540c580f --- .../deviceinfo/imei/ImeiInfoPreferenceController.java | 11 +++++++---- .../MobileNetworkImeiPreferenceController.kt | 4 ++-- .../imei/ImeiInfoPreferenceControllerTest.java | 2 +- .../MobileNetworkImeiPreferenceControllerTest.kt | 2 +- 4 files changed, 11 insertions(+), 8 deletions(-) diff --git a/src/com/android/settings/deviceinfo/imei/ImeiInfoPreferenceController.java b/src/com/android/settings/deviceinfo/imei/ImeiInfoPreferenceController.java index ff55184741a..13e26cc4c3a 100644 --- a/src/com/android/settings/deviceinfo/imei/ImeiInfoPreferenceController.java +++ b/src/com/android/settings/deviceinfo/imei/ImeiInfoPreferenceController.java @@ -132,10 +132,13 @@ public class ImeiInfoPreferenceController extends BasePreferenceController { @Override public int getAvailabilityStatus() { - boolean isAvailable = SubscriptionUtil.isSimHardwareVisible(mContext) && - mContext.getSystemService(UserManager.class).isAdminUser() && - !Utils.isWifiOnly(mContext); - return isAvailable ? AVAILABLE : UNSUPPORTED_ON_DEVICE; + if (!SubscriptionUtil.isSimHardwareVisible(mContext) || Utils.isWifiOnly(mContext)) { + return UNSUPPORTED_ON_DEVICE; + } + if (!mContext.getSystemService(UserManager.class).isAdminUser()) { + return DISABLED_FOR_USER; + } + return AVAILABLE; } @Override diff --git a/src/com/android/settings/network/telephony/MobileNetworkImeiPreferenceController.kt b/src/com/android/settings/network/telephony/MobileNetworkImeiPreferenceController.kt index 79807ecd2e9..ea51c9afef1 100644 --- a/src/com/android/settings/network/telephony/MobileNetworkImeiPreferenceController.kt +++ b/src/com/android/settings/network/telephony/MobileNetworkImeiPreferenceController.kt @@ -67,8 +67,8 @@ class MobileNetworkImeiPreferenceController(context: Context, key: String) : !SubscriptionUtil.isSimHardwareVisible(mContext) || Utils.isWifiOnly(mContext) -> UNSUPPORTED_ON_DEVICE !Flags.isDualSimOnboardingEnabled() - || !SubscriptionManager.isValidSubscriptionId(subId) - || !mContext.userManager.isAdminUser -> CONDITIONALLY_UNAVAILABLE + || !SubscriptionManager.isValidSubscriptionId(subId) -> CONDITIONALLY_UNAVAILABLE + !mContext.userManager.isAdminUser -> DISABLED_FOR_USER else -> AVAILABLE } diff --git a/tests/robotests/src/com/android/settings/deviceinfo/imei/ImeiInfoPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/imei/ImeiInfoPreferenceControllerTest.java index 007bbb6b36a..8cf286c35e4 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/imei/ImeiInfoPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/imei/ImeiInfoPreferenceControllerTest.java @@ -265,7 +265,7 @@ public class ImeiInfoPreferenceControllerTest { when(mUserManager.isAdminUser()).thenReturn(false); assertThat(mController.getAvailabilityStatus()).isEqualTo( - BasePreferenceController.UNSUPPORTED_ON_DEVICE); + BasePreferenceController.DISABLED_FOR_USER); } private void mockService(String serviceName, Class serviceClass, T service) { diff --git a/tests/spa_unit/src/com/android/settings/network/telephony/MobileNetworkImeiPreferenceControllerTest.kt b/tests/spa_unit/src/com/android/settings/network/telephony/MobileNetworkImeiPreferenceControllerTest.kt index 9d80d983107..024b8d202ca 100644 --- a/tests/spa_unit/src/com/android/settings/network/telephony/MobileNetworkImeiPreferenceControllerTest.kt +++ b/tests/spa_unit/src/com/android/settings/network/telephony/MobileNetworkImeiPreferenceControllerTest.kt @@ -187,7 +187,7 @@ class MobileNetworkImeiPreferenceControllerTest { } val availabilityStatus = controller.availabilityStatus - assertThat(availabilityStatus).isEqualTo(BasePreferenceController.CONDITIONALLY_UNAVAILABLE) + assertThat(availabilityStatus).isEqualTo(BasePreferenceController.DISABLED_FOR_USER) } @Test From 4cc14d65535a52afa65dd6a46e999fbc719f9929 Mon Sep 17 00:00:00 2001 From: Aleksander Morgado Date: Wed, 12 Feb 2025 14:55:30 +0000 Subject: [PATCH 6/8] Added unit tests for SimStatusPreferenceController visibility The new test checks whether the item is available when config_show_sim_info=false, when telephony is not data capable and when the user is not admin, The default visibility status for all tests is defined in the test setup(). Bug: 395714454 Flag: EXEMPT test only Test: atest SimStatusPreferenceControllerTest Change-Id: I8791d9fd4d7ab8648946f044d7aa6a0e77283a00 --- .../SimStatusPreferenceControllerTest.java | 54 +++++++++++++++++-- 1 file changed, 49 insertions(+), 5 deletions(-) diff --git a/tests/robotests/src/com/android/settings/deviceinfo/simstatus/SimStatusPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/simstatus/SimStatusPreferenceControllerTest.java index 5cfe4047d7d..a682055e9d9 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/simstatus/SimStatusPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/simstatus/SimStatusPreferenceControllerTest.java @@ -44,9 +44,6 @@ import com.android.settings.R; import com.android.settings.core.BasePreferenceController; import com.android.settingslib.search.SearchIndexableRaw; -import java.util.ArrayList; -import java.util.List; - import org.junit.Before; import org.junit.Ignore; import org.junit.Test; @@ -57,6 +54,9 @@ import org.mockito.MockitoAnnotations; import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; +import java.util.ArrayList; +import java.util.List; + @RunWith(RobolectricTestRunner.class) public class SimStatusPreferenceControllerTest { @@ -93,7 +93,6 @@ public class SimStatusPreferenceControllerTest { mResources = spy(mContext.getResources()); when(mContext.getResources()).thenReturn(mResources); - when(mResources.getBoolean(R.bool.config_show_sim_info)).thenReturn(true); mockService(Context.TELEPHONY_SERVICE, TelephonyManager.class, mTelephonyManager); mockService(Context.TELEPHONY_SUBSCRIPTION_SERVICE, SubscriptionManager.class, @@ -114,7 +113,12 @@ public class SimStatusPreferenceControllerTest { return 0; } }); - doReturn(BasePreferenceController.AVAILABLE).when(mController).getAvailabilityStatus(); + + // Availability defaults + when(mResources.getBoolean(R.bool.config_show_sim_info)).thenReturn(true); + when(mTelephonyManager.isDataCapable()).thenReturn(true); + when(mUserManager.isAdminUser()).thenReturn(true); + when(mScreen.getContext()).thenReturn(mContext); final String categoryKey = "device_detail_category"; when(mScreen.findPreference(categoryKey)).thenReturn(mCategory); @@ -210,6 +214,46 @@ public class SimStatusPreferenceControllerTest { assertThat(rawData.size()).isEqualTo(1); } + @Test + public void getAvailabilityStatus_showSimInfo_telephonyDataCapable_userAdmindisplayed() { + SlotSimStatus slotSimStatus = new TestSlotSimStatus(mContext); + mController.init(mFragment, slotSimStatus); + + // Use defaults + assertThat(mController.getAvailabilityStatus()).isEqualTo( + BasePreferenceController.AVAILABLE); + } + + @Test + public void getAvailabilityStatus_notShowSimInfo_telephonyDataCapable_userAdmin_notDisplayed() { + SlotSimStatus slotSimStatus = new TestSlotSimStatus(mContext); + mController.init(mFragment, slotSimStatus); + + when(mResources.getBoolean(R.bool.config_show_sim_info)).thenReturn(false); + assertThat(mController.getAvailabilityStatus()).isEqualTo( + BasePreferenceController.CONDITIONALLY_UNAVAILABLE); + } + + @Test + public void getAvailabilityStatus_showSimInfo_notTelephonyDataCapable_userAdmin_notDisplayed() { + SlotSimStatus slotSimStatus = new TestSlotSimStatus(mContext); + mController.init(mFragment, slotSimStatus); + + when(mTelephonyManager.isDataCapable()).thenReturn(false); + assertThat(mController.getAvailabilityStatus()).isEqualTo( + BasePreferenceController.CONDITIONALLY_UNAVAILABLE); + } + + @Test + public void getAvailabilityStatus_showSimInfo_telephonyDataCapable_notUserAdmin_notDisplayed() { + SlotSimStatus slotSimStatus = new TestSlotSimStatus(mContext); + mController.init(mFragment, slotSimStatus); + + when(mUserManager.isAdminUser()).thenReturn(false); + assertThat(mController.getAvailabilityStatus()).isEqualTo( + BasePreferenceController.CONDITIONALLY_UNAVAILABLE); + } + private void mockService(String serviceName, Class serviceClass, T service) { when(mContext.getSystemServiceName(serviceClass)).thenReturn(serviceName); when(mContext.getSystemService(serviceName)).thenReturn(service); From d58d0be2e17fe7bed7079b24eb930a8d2b39d73c Mon Sep 17 00:00:00 2001 From: Aleksander Morgado Date: Wed, 12 Feb 2025 16:46:53 +0000 Subject: [PATCH 7/8] Return UNSUPPORTED_ON_DEVICE in deviceinfo/simstatus when no telephony If the device does not have any telephony support (either via the build-time config_show_sim_info=false boolean flag, or when not declaring the PackageManager.FEATURE_TELEPHONY_DATA feature flag), returning UNSUPPORTED_ON_DEVICE makes more sense than CONDITIONALLY_UNAVAILABLE, as there is no runtime change that would make it available. Bug: 395714454 Flag: EXEMPT bugfix Test: atest SimStatusPreferenceControllerTest Change-Id: I0735c949a590190cdc177cbca835444691c50faa --- .../simstatus/SimStatusPreferenceController.java | 13 +++++++------ .../SimStatusPreferenceControllerTest.java | 4 ++-- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/src/com/android/settings/deviceinfo/simstatus/SimStatusPreferenceController.java b/src/com/android/settings/deviceinfo/simstatus/SimStatusPreferenceController.java index 828e016bdc7..7d13b2e9d4b 100644 --- a/src/com/android/settings/deviceinfo/simstatus/SimStatusPreferenceController.java +++ b/src/com/android/settings/deviceinfo/simstatus/SimStatusPreferenceController.java @@ -37,7 +37,6 @@ import com.android.settings.network.SubscriptionUtil; import com.android.settingslib.Utils; import com.android.settingslib.search.SearchIndexableRaw; -import java.util.ArrayList; import java.util.List; public class SimStatusPreferenceController extends BasePreferenceController { @@ -74,13 +73,15 @@ public class SimStatusPreferenceController extends BasePreferenceController { @Override public int getAvailabilityStatus() { - if (getSimSlotIndex() == SubscriptionManager.INVALID_SIM_SLOT_INDEX) { + if (!SubscriptionUtil.isSimHardwareVisible(mContext) + || Utils.isWifiOnly(mContext) + || getSimSlotIndex() == SubscriptionManager.INVALID_SIM_SLOT_INDEX) { return UNSUPPORTED_ON_DEVICE; } - boolean isAvailable = SubscriptionUtil.isSimHardwareVisible(mContext) && - mContext.getSystemService(UserManager.class).isAdminUser() && - !Utils.isWifiOnly(mContext); - return isAvailable ? AVAILABLE : CONDITIONALLY_UNAVAILABLE; + if (!mContext.getSystemService(UserManager.class).isAdminUser()) { + return CONDITIONALLY_UNAVAILABLE; + } + return AVAILABLE; } @Override diff --git a/tests/robotests/src/com/android/settings/deviceinfo/simstatus/SimStatusPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/simstatus/SimStatusPreferenceControllerTest.java index a682055e9d9..a3ea4645a6e 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/simstatus/SimStatusPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/simstatus/SimStatusPreferenceControllerTest.java @@ -231,7 +231,7 @@ public class SimStatusPreferenceControllerTest { when(mResources.getBoolean(R.bool.config_show_sim_info)).thenReturn(false); assertThat(mController.getAvailabilityStatus()).isEqualTo( - BasePreferenceController.CONDITIONALLY_UNAVAILABLE); + BasePreferenceController.UNSUPPORTED_ON_DEVICE); } @Test @@ -241,7 +241,7 @@ public class SimStatusPreferenceControllerTest { when(mTelephonyManager.isDataCapable()).thenReturn(false); assertThat(mController.getAvailabilityStatus()).isEqualTo( - BasePreferenceController.CONDITIONALLY_UNAVAILABLE); + BasePreferenceController.UNSUPPORTED_ON_DEVICE); } @Test From 22c88405261e9757edbdecbf0ea8d5786fcf1353 Mon Sep 17 00:00:00 2001 From: Aleksander Morgado Date: Wed, 12 Feb 2025 16:57:45 +0000 Subject: [PATCH 8/8] Return DISABLED_FOR_USER in deviceinfo/simstatus availability if not admin user The correct return when checking for the SIM status field availability for non-admin users is DISABLED_FOR_USER. UNSUPPORTED_ON_DEVICE should only be used when the setting is unconditionally hidden as the device does not support the feature. Bug: 395714454 Flag: EXEMPT bugfix Test: atest SimStatusPreferenceControllerTest Change-Id: I9bd290f1bdd73909be383a24f2c762d295089ff6 --- .../deviceinfo/simstatus/SimStatusPreferenceController.java | 2 +- .../deviceinfo/simstatus/SimStatusPreferenceControllerTest.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/com/android/settings/deviceinfo/simstatus/SimStatusPreferenceController.java b/src/com/android/settings/deviceinfo/simstatus/SimStatusPreferenceController.java index 7d13b2e9d4b..6431c5a1317 100644 --- a/src/com/android/settings/deviceinfo/simstatus/SimStatusPreferenceController.java +++ b/src/com/android/settings/deviceinfo/simstatus/SimStatusPreferenceController.java @@ -79,7 +79,7 @@ public class SimStatusPreferenceController extends BasePreferenceController { return UNSUPPORTED_ON_DEVICE; } if (!mContext.getSystemService(UserManager.class).isAdminUser()) { - return CONDITIONALLY_UNAVAILABLE; + return DISABLED_FOR_USER; } return AVAILABLE; } diff --git a/tests/robotests/src/com/android/settings/deviceinfo/simstatus/SimStatusPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/simstatus/SimStatusPreferenceControllerTest.java index a3ea4645a6e..54c10b46b40 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/simstatus/SimStatusPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/simstatus/SimStatusPreferenceControllerTest.java @@ -251,7 +251,7 @@ public class SimStatusPreferenceControllerTest { when(mUserManager.isAdminUser()).thenReturn(false); assertThat(mController.getAvailabilityStatus()).isEqualTo( - BasePreferenceController.CONDITIONALLY_UNAVAILABLE); + BasePreferenceController.DISABLED_FOR_USER); } private void mockService(String serviceName, Class serviceClass, T service) {