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

Commit 3a1c8dfb authored by Malcolm Chen's avatar Malcolm Chen
Browse files

Use updated SubscriptionInfo constructor. 

Bug: 92796390
Test: build
Change-Id: If71dead17b725b312335c6def871742f509652a7
Merged-In: If71dead17b725b312335c6def871742f509652a7
parent e5450a62

tests/telephonytests/src/com/android/internal/telephony/SubscriptionInfoTest.java

+1 −1
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ public class SubscriptionInfoTest { 
    @Before

    public void setUp() throws Exception {

        mSubscriptionInfoUT = new SubscriptionInfo(1, "890126042XXXXXXXXXXX", 0, "T-mobile",

                "T-mobile", 0, 255, "12345", 0, null, "310", "260", "156");

                "T-mobile", 0, 255, "12345", 0, null, "310", "260", "156", false, null, null);

    }



    @Test

tests/telephonytests/src/com/android/internal/telephony/SubscriptionInfoUpdaterTest.java

+5 −5
Original line number Diff line number Diff line
@@ -454,11 +454,11 @@ public class SubscriptionInfoUpdaterTest extends TelephonyTest { 
        // 1: not embedded, but has matching iccid with an embedded subscription.

        subInfoList.add(new SubscriptionInfo(

                        0, "1", 0, "", "", 0, 0, "", 0, null, "0", "0", "", false /* isEmbedded */,

                        null /* accessRules */));

                        null /* accessRules */, null));

        // 2: embedded but no longer present.

        subInfoList.add(new SubscriptionInfo(

                0, "2", 0, "", "", 0, 0, "", 0, null, "0", "0", "", true /* isEmbedded */,

                null /* accessRules */));

                null /* accessRules */, null));



        when(mSubscriptionController.getSubscriptionInfoListForEmbeddedSubscriptionUpdate(

                new String[] { "1", "3"}, false /* removable */)).thenReturn(subInfoList);
@@ -505,11 +505,11 @@ public class SubscriptionInfoUpdaterTest extends TelephonyTest { 
        // 1: not embedded, but has matching iccid with an embedded subscription.

        subInfoList.add(new SubscriptionInfo(

                0, "1", 0, "", "", 0, 0, "", 0, null, "0", "0", "", false /* isEmbedded */,

                null /* accessRules */));

                null /* accessRules */, null));

        // 2: embedded.

        subInfoList.add(new SubscriptionInfo(

                0, "2", 0, "", "", 0, 0, "", 0, null, "0", "0", "", true /* isEmbedded */,

                null /* accessRules */));

                null /* accessRules */, null));



        when(mSubscriptionController.getSubscriptionInfoListForEmbeddedSubscriptionUpdate(

                new String[0], false /* removable */)).thenReturn(subInfoList);
@@ -547,7 +547,7 @@ public class SubscriptionInfoUpdaterTest extends TelephonyTest { 
        // 1: not embedded.

        subInfoList.add(new SubscriptionInfo(

                0, "1", 0, "", "", 0, 0, "", 0, null, "0", "0", "", false /* isEmbedded */,

                null /* accessRules */));

                null /* accessRules */, null));



        when(mSubscriptionController.getSubscriptionInfoListForEmbeddedSubscriptionUpdate(

                new String[0], false /* removable */)).thenReturn(subInfoList);

tests/telephonytests/src/com/android/internal/telephony/euicc/EuiccControllerTest.java

+3 −2
Original line number Diff line number Diff line
@@ -838,7 +838,7 @@ public class EuiccControllerTest extends TelephonyTest { 
            throws Exception {

        SubscriptionInfo subInfo = new SubscriptionInfo(

                0, "", 0, "", "", 0, 0, "", 0, null, "0", "0", "", true /* isEmbedded */,

                hasPrivileges ? new UiccAccessRule[] { ACCESS_RULE } : null);

                hasPrivileges ? new UiccAccessRule[] { ACCESS_RULE } : null, null);

        when(mSubscriptionManager.canManageSubscription(subInfo, PACKAGE_NAME)).thenReturn(

                hasPrivileges);

        when(mSubscriptionManager.getActiveSubscriptionInfoList()).thenReturn(
@@ -848,7 +848,8 @@ public class EuiccControllerTest extends TelephonyTest { 
    private void prepareOperationSubscription(boolean hasPrivileges) throws Exception {

        SubscriptionInfo subInfo = new SubscriptionInfo(

                SUBSCRIPTION_ID, ICC_ID, 0, "", "", 0, 0, "", 0, null, "0", "0", "",

                true /* isEmbedded */, hasPrivileges ? new UiccAccessRule[] { ACCESS_RULE } : null);

                true /* isEmbedded */, hasPrivileges ? new UiccAccessRule[] { ACCESS_RULE } : null,

                null);

        when(mSubscriptionManager.canManageSubscription(subInfo, PACKAGE_NAME)).thenReturn(

                hasPrivileges);

        when(mSubscriptionManager.getAvailableSubscriptionInfoList()).thenReturn(