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

Commit 20f20fee authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 6927089 from c9c28a82 to rvc-qpr2-release 

Change-Id: I1569cc847c59495e54ea78780c98d1876315abf9
parents 7b9c8259 c9c28a82

src/java/com/android/internal/telephony/SubscriptionInfoUpdater.java

+4 −3
Original line number Diff line number Diff line
@@ -1050,15 +1050,16 @@ public class SubscriptionInfoUpdater extends Handler { 
        // this current package is not a CarrierServicePackage

        String[] certs = config.getStringArray(

            CarrierConfigManager.KEY_CARRIER_CERTIFICATE_STRING_ARRAY);

        UiccAccessRule[] carrierConfigAccessRules = null;

        if (certs != null) {

            UiccAccessRule[] carrierConfigAccessRules = new UiccAccessRule[certs.length];

            carrierConfigAccessRules = new UiccAccessRule[certs.length];

            for (int i = 0; i < certs.length; i++) {

                carrierConfigAccessRules[i] = new UiccAccessRule(IccUtils.hexStringToBytes(

                    certs[i]), null, 0);

            }

        }

        cv.put(SubscriptionManager.ACCESS_RULES_FROM_CARRIER_CONFIGS,

                UiccAccessRule.encodeRules(carrierConfigAccessRules));

        }



        if (!isCarrierServicePackage(phoneId, configPackageName)) {

            loge("Cannot manage subId=" + currentSubId + ", carrierPackage=" + configPackageName);

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

+10 −6
Original line number Diff line number Diff line
@@ -725,9 +725,10 @@ public class SubscriptionInfoUpdaterTest extends TelephonyTest { 
        mUpdater.updateSubscriptionByCarrierConfig(mPhone.getPhoneId(),

                carrierPackageName, new PersistableBundle());



        verify(mContentProvider, never()).update(any(), any(), any(), any());

        verify(mSubscriptionController, never()).refreshCachedActiveSubscriptionInfoList();

        verify(mSubscriptionController, never()).notifySubscriptionInfoChanged();

        //at each call to updateSubscriptionByCarrierConfig, only carrier certs are updated

        verify(mContentProvider, times(1)).update(any(), any(), any(), any());

        verify(mSubscriptionController, times(1)).notifySubscriptionInfoChanged();

        verify(mSubscriptionController, times(1)).refreshCachedActiveSubscriptionInfoList();

    }



    @Test
@@ -756,7 +757,8 @@ public class SubscriptionInfoUpdaterTest extends TelephonyTest { 
                cvCaptor.capture(), eq(null), eq(null));

        assertEquals(1, cvCaptor.getValue().getAsInteger(

                SubscriptionManager.IS_OPPORTUNISTIC).intValue());

        assertEquals(1, cvCaptor.getValue().size());

        // 2 updates: isOpportunistic, and carrier certs:

        assertEquals(2, cvCaptor.getValue().size());

        verify(mSubscriptionController, times(1)).refreshCachedActiveSubscriptionInfoList();

        verify(mSubscriptionController, times(1)).notifySubscriptionInfoChanged();

    }
@@ -792,7 +794,8 @@ public class SubscriptionInfoUpdaterTest extends TelephonyTest { 
                cvCaptor.getValue().getAsString(SubscriptionManager.GROUP_UUID));

        assertEquals(carrierPackageName,

                cvCaptor.getValue().getAsString(SubscriptionManager.GROUP_OWNER));

        assertEquals(3, cvCaptor.getValue().size());

        // 4 updates: isOpportunistic, groupUuid, groupOwner, and carrier certs:

        assertEquals(4, cvCaptor.getValue().size());

    }



    @Test
@@ -825,7 +828,8 @@ public class SubscriptionInfoUpdaterTest extends TelephonyTest { 
        assertEquals(1, cvCaptor.getValue().getAsInteger(

                SubscriptionManager.IS_OPPORTUNISTIC).intValue());

        assertNull(cvCaptor.getValue().getAsString(SubscriptionManager.GROUP_UUID));

        assertEquals(2, cvCaptor.getValue().size());

        // 3 updates: isOpportunistic, groupUuid, and carrier certs:

        assertEquals(3, cvCaptor.getValue().size());

    }



    @Test