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

Commit 422e23ef authored by Aleksander Morgado's avatar Aleksander Morgado
Browse files

Remove isSimHardwareVisible() helper 

The logic provided by the helper is now replaced by the new
isMobileDataCapable() and isVoiceCapable() helpers.

Bug: 395714454
Test: mm && atest
Flag: EXEMPT refactor
Change-Id: I085a663607885f2f5304a77d5f57190f8f570f23
parent edece0c1

src/com/android/settings/network/SubscriptionUtil.java

+0 −8
Original line number Original line Diff line number Diff line
@@ -123,14 +123,6 @@ public class SubscriptionUtil { 
                .collect(Collectors.toList());

                .collect(Collectors.toList());

    }

    }





    /**

     * Check if SIM hardware is visible to the end user.

     */

    public static boolean isSimHardwareVisible(Context context) {

        return context.getResources()

            .getBoolean(R.bool.config_show_sim_info);

    }



    @VisibleForTesting

    @VisibleForTesting

    static boolean isInactiveInsertedPSim(UiccSlotInfo slotInfo) {

    static boolean isInactiveInsertedPSim(UiccSlotInfo slotInfo) {

        if (slotInfo == null)  {

        if (slotInfo == null)  {

tests/unit/src/com/android/settings/network/SubscriptionUtilTest.java

+0 −18
Original line number Original line Diff line number Diff line
@@ -45,7 +45,6 @@ import android.text.TextUtils; 
import androidx.test.core.app.ApplicationProvider;

import androidx.test.core.app.ApplicationProvider;

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

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





import com.android.settings.R;

import com.android.settings.network.telephony.SubscriptionActionDialogActivity;

import com.android.settings.network.telephony.SubscriptionActionDialogActivity;





import org.junit.Before;

import org.junit.Before;
@@ -564,23 +563,6 @@ public class SubscriptionUtilTest { 
        assertThat(SubscriptionUtil.isInactiveInsertedPSim(null)).isFalse();

        assertThat(SubscriptionUtil.isInactiveInsertedPSim(null)).isFalse();

    }

    }





    @Test

    public void isSimHardwareVisible_configAsInvisible_returnFalse() {

        when(mResources.getBoolean(R.bool.config_show_sim_info))

                .thenReturn(false);



        assertThat(SubscriptionUtil.isSimHardwareVisible(mContext)).isFalse();

    }



    @Test

    @Ignore("b/339149463")

    public void isSimHardwareVisible_configAsVisible_returnTrue() {

        when(mResources.getBoolean(R.bool.config_show_sim_info))

                .thenReturn(true);



        assertTrue(SubscriptionUtil.isSimHardwareVisible(mContext));

    }



    @Test

    @Test

    public void isValidCachedDisplayName_matchesRule1_returnTrue() {

    public void isValidCachedDisplayName_matchesRule1_returnTrue() {

        String originalName = "originalName";

        String originalName = "originalName";