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

Commit 8b7e6c28 authored by Chaohui Wang's avatar Chaohui Wang
Browse files

Check isSimHardwareVisible earlier 

In SimEidPreferenceController, to reduce flaky on no SIM devices.

Bug: 304560734
Test: manual - on "About phone / tablet" page
Test: unit test
Change-Id: I07ae9b785d0fbe24a866883080a466a2110ca68f
parent f610b193

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

+8 −11
Original line number Diff line number Diff line
@@ -59,11 +59,13 @@ class SimEidPreferenceController(context: Context, preferenceKey: String) : 
    }



    /**

     * Returns available here, but UI availability is retrieved asynchronously later.

     * Returns available here, if SIM hardware is visible.

     *

     * Check [updateNonIndexableKeys] for search availability.

     * Also check [getIsAvailableAndUpdateEid] for other availability check which retrieved

     * asynchronously later.

     */

    override fun getAvailabilityStatus() = AVAILABLE

    override fun getAvailabilityStatus() =

        if (SubscriptionUtil.isSimHardwareVisible(mContext)) AVAILABLE else UNSUPPORTED_ON_DEVICE



    override fun displayPreference(screen: PreferenceScreen) {

        super.displayPreference(screen)
@@ -95,12 +97,7 @@ class SimEidPreferenceController(context: Context, preferenceKey: String) : 
    }



    private fun getIsAvailableAndUpdateEid(): Boolean {

        if (!SubscriptionUtil.isSimHardwareVisible(mContext) ||

            !mContext.userManager.isAdminUser ||

            Utils.isWifiOnly(mContext)

        ) {

            return false

        }

        if (!mContext.userManager.isAdminUser || Utils.isWifiOnly(mContext)) return false

        eid = eidStatus?.eid ?: ""

        return eid.isNotEmpty()

    }
@@ -147,8 +144,8 @@ class SimEidPreferenceController(context: Context, preferenceKey: String) : 
    }



    override fun updateNonIndexableKeys(keys: MutableList<String>) {

        if (!getIsAvailableAndUpdateEid()) {

            keys.add(preferenceKey)

        if (!isAvailable() || !getIsAvailableAndUpdateEid()) {

            keys += preferenceKey

        }

    }

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

0 → 100644
+77 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2023 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



package com.android.settings.deviceinfo.simstatus



import android.content.Context

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.core.BasePreferenceController

import com.android.settings.network.SubscriptionUtil

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.whenever

import org.mockito.quality.Strictness



@RunWith(AndroidJUnit4::class)

class SimEidPreferenceControllerTest {

    private lateinit var mockSession: MockitoSession



    private val context: Context = ApplicationProvider.getApplicationContext()



    private val controller = SimEidPreferenceController(context, TEST_KEY)



    @Before

    fun setUp() {

        mockSession = ExtendedMockito.mockitoSession()

            .initMocks(this)

            .mockStatic(SubscriptionUtil::class.java)

            .strictness(Strictness.LENIENT)

            .startMocking()

    }



    @After

    fun tearDown() {

        mockSession.finishMocking()

    }



    @Test

    fun getAvailabilityStatus_isSimHardwareVisible() {

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



        val availabilityStatus = controller.availabilityStatus



        assertThat(availabilityStatus).isEqualTo(BasePreferenceController.AVAILABLE)

    }



    @Test

    fun getAvailabilityStatus_notSimHardwareVisible() {

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



        val availabilityStatus = controller.availabilityStatus



        assertThat(availabilityStatus).isEqualTo(BasePreferenceController.UNSUPPORTED_ON_DEVICE)

    }



    private companion object {

        const val TEST_KEY = "test_key"

    }

}