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

Commit 0a36e91a authored by Malcolm Chen's avatar Malcolm Chen Committed by Xiangyu/Malcolm Chen
Browse files

Don't show hidden subscriptions. 

Replace getAvailableSubscriptionInfoList with getSelectableSubscriptionInfoList
so that hidden subscriptions won't show up.

Bug: 121396526
Test: manual
Change-Id: I73c41a6605b68011ba5b619f9d6e8d41d18a9dcd
parent 57b076fa

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

+1 −1
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ public class SubscriptionUtil { 
        if (sResultsForTesting != null) {

            return sResultsForTesting;

        }

        List<SubscriptionInfo> subscriptions = manager.getAvailableSubscriptionInfoList();

        List<SubscriptionInfo> subscriptions = manager.getSelectableSubscriptionInfoList();

        if (subscriptions == null) {

            subscriptions = new ArrayList<>();

        }

src/com/android/settings/network/telephony/MobileNetworkActivity.java

+1 −1
Original line number Diff line number Diff line
@@ -160,7 +160,7 @@ public class MobileNetworkActivity extends SettingsBaseActivity { 
            final int subId = intent.getIntExtra(Settings.EXTRA_SUB_ID, SUB_ID_NULL);

            if (subId != SUB_ID_NULL) {

                for (SubscriptionInfo subscription :

                        mSubscriptionManager.getAvailableSubscriptionInfoList()) {

                        mSubscriptionManager.getSelectableSubscriptionInfoList()) {

                    if (subscription.getSubscriptionId() == subId) {

                        return subscription;

                    }

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

+5 −5
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ public class SubscriptionUtilTest { 


    @Test

    public void getAvailableSubscriptions_nullInfoFromSubscriptionManager_nonNullResult() {

        when(mManager.getAvailableSubscriptionInfoList()).thenReturn(null);

        when(mManager.getSelectableSubscriptionInfoList()).thenReturn(null);

        final List<SubscriptionInfo> subs = SubscriptionUtil.getAvailableSubscriptions(mManager);

        assertThat(subs).isNotNull();

        assertThat(subs).isEmpty();
@@ -57,7 +57,7 @@ public class SubscriptionUtilTest { 
    public void getAvailableSubscriptions_oneSubscription_oneResult() {

        final SubscriptionInfo info = mock(SubscriptionInfo.class);

        when(info.getMncString()).thenReturn("fake1234");

        when(mManager.getAvailableSubscriptionInfoList()).thenReturn(Arrays.asList(info));

        when(mManager.getSelectableSubscriptionInfoList()).thenReturn(Arrays.asList(info));

        final List<SubscriptionInfo> subs = SubscriptionUtil.getAvailableSubscriptions(mManager);

        assertThat(subs).isNotNull();

        assertThat(subs).hasSize(1);
@@ -69,7 +69,7 @@ public class SubscriptionUtilTest { 
        final SubscriptionInfo info2 = mock(SubscriptionInfo.class);

        when(info1.getMncString()).thenReturn("fake1234");

        when(info2.getMncString()).thenReturn("fake5678");

        when(mManager.getAvailableSubscriptionInfoList()).thenReturn(Arrays.asList(info1, info2));

        when(mManager.getSelectableSubscriptionInfoList()).thenReturn(Arrays.asList(info1, info2));

        final List<SubscriptionInfo> subs = SubscriptionUtil.getAvailableSubscriptions(mManager);

        assertThat(subs).isNotNull();

        assertThat(subs).hasSize(2);
@@ -82,7 +82,7 @@ public class SubscriptionUtilTest { 
        final SubscriptionInfo info3 = mock(SubscriptionInfo.class);

        when(info1.getSubscriptionId()).thenReturn(1);

        when(info1.getMncString()).thenReturn("fake1234");

        when(mManager.getAvailableSubscriptionInfoList()).thenReturn(

        when(mManager.getSelectableSubscriptionInfoList()).thenReturn(

                new ArrayList<>(Arrays.asList(info1, info2, info3)));

        final List<SubscriptionInfo> subs = SubscriptionUtil.getAvailableSubscriptions(mManager);

        assertThat(subs).isNotNull();
@@ -100,7 +100,7 @@ public class SubscriptionUtilTest { 
        when(info1.getMncString()).thenReturn("fake1234");

        when(info4.getSubscriptionId()).thenReturn(4);

        when(info4.getMncString()).thenReturn("fake5678");

        when(mManager.getAvailableSubscriptionInfoList()).thenReturn(new ArrayList<>(

        when(mManager.getSelectableSubscriptionInfoList()).thenReturn(new ArrayList<>(

                Arrays.asList(info1, info2, info3, info4)));

        final List<SubscriptionInfo> subs = SubscriptionUtil.getAvailableSubscriptions(mManager);

        assertThat(subs).isNotNull();

tests/robotests/src/com/android/settings/network/telephony/MobileNetworkActivityTest.java

+1 −1
Original line number Diff line number Diff line
@@ -148,7 +148,7 @@ public class MobileNetworkActivityTest { 
        doReturn(intent).when(mMobileNetworkActivity).getIntent();

        mSubscriptionInfos.add(mSubscriptionInfo);

        mSubscriptionInfos.add(mSubscriptionInfo2);

        doReturn(mSubscriptionInfos).when(mSubscriptionManager).getAvailableSubscriptionInfoList();

        doReturn(mSubscriptionInfos).when(mSubscriptionManager).getSelectableSubscriptionInfoList();

        doReturn(true).when(mSubscriptionManager).isActiveSubscriptionId(CURRENT_SUB_ID);



        assertThat(mMobileNetworkActivity.getSubscriptionId()).isEqualTo(CURRENT_SUB_ID);