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

Commit bb5688ea authored by Bonian Chen's avatar Bonian Chen Committed by Automerger Merge Worker
Browse files

Merge changes from topic "eSIM with same group UUID" into rvc-qpr-dev am: 0968b860 

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13241064

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I104ea3e6ace5e0d3fbe80d62e835d2fa986b852b
parents 4ea9c2d6 0968b860

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

+3 −3
Original line number Diff line number Diff line
@@ -170,7 +170,7 @@ public class SubscriptionsPreferenceController extends AbstractPreferenceControl 
            // Avoid from showing subscription(SIM)s which has been marked as hidden

            // For example, only one subscription will be shown when there're multiple

            // subscriptions with same group UUID.

            if (!isSubscriptionCanBeDisplayed(mContext, subId)) {

            if (!canSubscriptionBeDisplayed(mContext, subId)) {

                continue;

            }

            activeSubIds.add(subId);
@@ -308,7 +308,7 @@ public class SubscriptionsPreferenceController extends AbstractPreferenceControl 
                // For example, only one subscription will be shown when there're multiple

                // subscriptions with same group UUID.

                .filter(subInfo ->

                        isSubscriptionCanBeDisplayed(mContext, subInfo.getSubscriptionId()))

                        canSubscriptionBeDisplayed(mContext, subInfo.getSubscriptionId()))

                .count() >= 2;

    }
@@ -349,7 +349,7 @@ public class SubscriptionsPreferenceController extends AbstractPreferenceControl 
    }



    @VisibleForTesting

    boolean isSubscriptionCanBeDisplayed(Context context, int subId) {

    boolean canSubscriptionBeDisplayed(Context context, int subId) {

        return (SubscriptionUtil.getAvailableSubscription(context,

                ProxySubscriptionManager.getInstance(context), subId) != null);

    }

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

+2 −2
Original line number Diff line number Diff line
@@ -122,7 +122,7 @@ public class SubscriptionsPreferenceControllerTest { 
        mController = spy(

                new SubscriptionsPreferenceController(mContext, mLifecycle, mUpdateListener,

                        KEY, 5));

        doReturn(true).when(mController).isSubscriptionCanBeDisplayed(any(), anyInt());

        doReturn(true).when(mController).canSubscriptionBeDisplayed(any(), anyInt());

        doReturn(mSignalStrengthIcon).when(mController).getIcon(anyInt(), anyInt(), anyBoolean());

    }
@@ -458,7 +458,7 @@ public class SubscriptionsPreferenceControllerTest { 


    @Test

    public void displayPreference_subscriptionsWithSameGroupUUID_onlyOneWillBeSeen() {

        doReturn(false).when(mController).isSubscriptionCanBeDisplayed(any(), eq(3));

        doReturn(false).when(mController).canSubscriptionBeDisplayed(any(), eq(3));

        final List<SubscriptionInfo> subs = setupMockSubscriptions(3);

        SubscriptionUtil.setActiveSubscriptionsForTesting(subs.subList(0, 3));