Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a66d27c4 authored by Aleksander Morgado's avatar Aleksander Morgado
Browse files

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
parent 90feafb1

src/com/android/settings/network/telephony/MobileNetworkPhoneNumberPreferenceController.kt

+3 −3
Original line number Diff line number Diff line
@@ -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

    }

tests/spa_unit/src/com/android/settings/network/telephony/MobileNetworkPhoneNumberPreferenceControllerTest.kt

+2 −2
Original line number Diff line number Diff line
@@ -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 {