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

Commit 40bb8897 authored by Aleksander Morgado's avatar Aleksander Morgado
Browse files

Use isMobileDataCapable/isVoiceCapable helpers in deviceinfo/eid 

Disabling telephony support may be done either with the
config_show_sim_info config option, or based on whether
TelephonyManager reports data capabilities. The isMobileDataCapable()
helper method ensures both ways are supported.

Additionally, the logic is also updated to explicitly check for voice
support, so that disabling this telephony element happens only when
both mobile data and voice are unsupported.

The unit tests are updated to consider both no-data and no-voice
cases, by mocking both Resources and TelephonyManager.

Bug: 395714454
Test: mm && atest SimEidPreferenceControllerTest
Flag: EXEMPT bugfix
Change-Id: I37410eb050a8e3640f8814497a199eb371cf57d5
parent 360e6d3b

src/com/android/settings/deviceinfo/simstatus/SimEidPreferenceController.kt

+3 −4
Original line number Diff line number Diff line
@@ -28,11 +28,10 @@ import androidx.lifecycle.repeatOnLifecycle 
import androidx.preference.Preference

import androidx.preference.PreferenceScreen

import com.android.settings.R

import com.android.settings.Utils

import com.android.settings.core.BasePreferenceController

import com.android.settings.deviceinfo.PhoneNumberUtil

import com.android.settings.network.SubscriptionUtil

import com.android.settingslib.CustomDialogPreferenceCompat

import com.android.settingslib.Utils

import com.android.settingslib.qrcode.QrCodeGenerator

import com.android.settingslib.spaprivileged.framework.common.userManager

import kotlinx.coroutines.CoroutineScope
@@ -65,8 +64,8 @@ class SimEidPreferenceController(context: Context, preferenceKey: String) : 
     * asynchronously later.

     */

    override fun getAvailabilityStatus() = when {

        !SubscriptionUtil.isSimHardwareVisible(mContext)

            || Utils.isWifiOnly(mContext) -> UNSUPPORTED_ON_DEVICE

        !Utils.isMobileDataCapable(mContext)

            && !Utils.isVoiceCapable(mContext) -> UNSUPPORTED_ON_DEVICE

        !mContext.userManager.isAdminUser -> DISABLED_FOR_USER

        else -> AVAILABLE

    }

tests/spa_unit/src/com/android/settings/deviceinfo/simstatus/SimEidPreferenceControllerTest.kt

+51 −28
Original line number Diff line number Diff line
@@ -17,94 +17,117 @@ 
package com.android.settings.deviceinfo.simstatus



import android.content.Context

import android.content.res.Resources

import android.os.UserManager

import android.telephony.TelephonyManager

import androidx.test.core.app.ApplicationProvider

import androidx.test.ext.junit.runners.AndroidJUnit4

import com.android.dx.mockito.inline.extended.ExtendedMockito

import com.android.settings.R

import com.android.settings.core.BasePreferenceController

import com.android.settings.network.SubscriptionUtil

import com.android.settingslib.Utils

import com.google.common.truth.Truth.assertThat

import org.junit.After

import org.junit.Before

import org.junit.Test

import org.junit.runner.RunWith

import org.mockito.MockitoSession

import org.mockito.kotlin.doReturn

import org.mockito.kotlin.mock

import org.mockito.kotlin.spy

import org.mockito.kotlin.stub

import org.mockito.kotlin.whenever

import org.mockito.quality.Strictness



@RunWith(AndroidJUnit4::class)

class SimEidPreferenceControllerTest {

    private lateinit var mockSession: MockitoSession



    private val mockUserManager = mock<UserManager>()

    private val mockTelephonyManager = mock<TelephonyManager>()

    private val mockResources = mock<Resources>()



    private val context: Context =

        spy(ApplicationProvider.getApplicationContext()) {

            on { getSystemService(UserManager::class.java) } doReturn mockUserManager

            on { getSystemService(TelephonyManager::class.java) } doReturn mockTelephonyManager

	    on { getSystemService(Context.TELEPHONY_SERVICE) } doReturn mockTelephonyManager

            on { resources } doReturn mockResources

        }



    private val controller = SimEidPreferenceController(context, TEST_KEY)



    @Before

    fun setUp() {

        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)

        mockTelephonyManager.stub {

            on { isDataCapable } doReturn true

            on { isDeviceVoiceCapable } doReturn true

        }

        mockResources.stub {

            on { getBoolean(R.bool.config_show_sim_info) } doReturn true

        }

        mockUserManager.stub {

            on { isAdminUser } doReturn true

        }

    }



    @After

    fun tearDown() {

        mockSession.finishMocking()

    }



    @Test

    fun getAvailabilityStatus_simHardwareVisible_userAdmin_notWifiOnly_displayed() {

    fun getAvailabilityStatus_default_displayed() {

        // Use defaults from setup()

        val availabilityStatus = controller.availabilityStatus

        assertThat(availabilityStatus).isEqualTo(BasePreferenceController.AVAILABLE)

    }



    @Test

    fun getAvailabilityStatus_notSimHardwareVisible_userAdmin_notWifiOnly_notDisplayed() {

        whenever(SubscriptionUtil.isSimHardwareVisible(context)).thenReturn(false)

    fun getAvailabilityStatus_noShowSimInfo_notDisplayed() {

        mockResources.stub {

            on { getBoolean(R.bool.config_show_sim_info) } doReturn false

        }



        val availabilityStatus = controller.availabilityStatus

        assertThat(availabilityStatus).isEqualTo(BasePreferenceController.UNSUPPORTED_ON_DEVICE)

    }



    @Test

    fun getAvailabilityStatus_simHardwareVisible_notUserAdmin_notWifiOnly_notDisplayed() {

        mockUserManager.stub {

            on { isAdminUser } doReturn false

    fun getAvailabilityStatus_voiceCapable_notDataCapable_displayed() {

        mockTelephonyManager.stub {

            on { isDeviceVoiceCapable } doReturn true

            on { isDataCapable } doReturn false

        }



        val availabilityStatus = controller.availabilityStatus

        assertThat(availabilityStatus).isEqualTo(BasePreferenceController.DISABLED_FOR_USER)

        assertThat(availabilityStatus).isEqualTo(BasePreferenceController.AVAILABLE)

    }



    @Test

    fun getAvailabilityStatus_simHardwareVisible_userAdmin_wifiOnly_notDisplayed() {

        whenever(Utils.isWifiOnly(context)).thenReturn(true)

    fun getAvailabilityStatus_notVoiceCapable_dataCapable_displayed() {

        mockTelephonyManager.stub {

            on { isDeviceVoiceCapable } doReturn false

            on { isDataCapable } doReturn true

        }



        val availabilityStatus = controller.availabilityStatus

        assertThat(availabilityStatus).isEqualTo(BasePreferenceController.AVAILABLE)

    }



    @Test

    fun getAvailabilityStatus_notVoiceCapable_notDataCapable_notDisplayed() {

        mockTelephonyManager.stub {

            on { isDeviceVoiceCapable } doReturn false

            on { isDataCapable } doReturn false

        }



        val availabilityStatus = controller.availabilityStatus

        assertThat(availabilityStatus).isEqualTo(BasePreferenceController.UNSUPPORTED_ON_DEVICE)

    }



    @Test

    fun getAvailabilityStatus_noUserAdmin_notDisplayed() {

        mockUserManager.stub {

            on { isAdminUser } doReturn false

        }



        val availabilityStatus = controller.availabilityStatus

        assertThat(availabilityStatus).isEqualTo(BasePreferenceController.DISABLED_FOR_USER)

    }



    private companion object {

        const val TEST_KEY = "test_key"

    }