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

Commit 50002d93 authored by Jack Yu's avatar Jack Yu Committed by Automerger Merge Worker
Browse files

Merge changes I3a7cbcda,If99f0873,I8567714c,I35510311 into main am: 97402b0c 

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/2681501



Change-Id: I36535c5c054b838c258eb249b91ba47265127540
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents a90841a2 97402b0c

src/java/com/android/internal/telephony/subscription/SubscriptionManagerService.java

+7 −2
Original line number Diff line number Diff line
@@ -1001,7 +1001,7 @@ public class SubscriptionManagerService extends ISub.Stub { 
        mBackgroundHandler.post(() -> {

            // Do nothing if eUICCs are disabled. (Previous entries may remain in the cache, but

            // they are filtered out of list calls as long as EuiccManager.isEnabled returns false).

            if (mEuiccManager == null || !mEuiccManager.isEnabled()) {

            if (mEuiccManager == null || !mEuiccManager.isEnabled() || mEuiccController == null) {

                loge("updateEmbeddedSubscriptions: eUICC not enabled");

                if (callback != null) {

                    callback.run();
@@ -1014,7 +1014,7 @@ public class SubscriptionManagerService extends ISub.Stub { 


            for (UiccSlot slot : mUiccController.getUiccSlots()) {

                if (slot != null) {

                    log("  " + slot.toString());

                    log("  " + slot);

                }

            }
@@ -1022,6 +1022,11 @@ public class SubscriptionManagerService extends ISub.Stub { 
                GetEuiccProfileInfoListResult result = mEuiccController

                        .blockingGetEuiccProfileInfoList(cardId);

                logl("updateEmbeddedSubscriptions: cardId=" + cardId + ", result=" + result);

                if (result == null) {

                    //TODO: Add back-off retry in the future if needed.

                    loge("Failed to get euicc profiles.");

                    continue;

                }



                if (result.getResult() != EuiccService.RESULT_OK) {

                    loge("Failed to get euicc profile info. result="

tests/telephonytests/src/com/android/internal/telephony/subscription/SubscriptionManagerServiceTest.java

+15 −0
Original line number Diff line number Diff line
@@ -829,6 +829,21 @@ public class SubscriptionManagerServiceTest extends TelephonyTest { 
        assertThat(subInfo.getNativeAccessRules()).isEqualTo(FAKE_NATIVE_ACCESS_RULES2);

    }



    @Test

    public void testUpdateEmbeddedSubscriptionsNullResult() {

        // Grant READ_PHONE_STATE permission.

        mContextFixture.addCallingOrSelfPermission(Manifest.permission.READ_PHONE_STATE);



        doReturn(null).when(mEuiccController).blockingGetEuiccProfileInfoList(anyInt());



        mSubscriptionManagerServiceUT.updateEmbeddedSubscriptions(List.of(1, 2), null);

        processAllMessages();



        List<SubscriptionInfo> subInfoList = mSubscriptionManagerServiceUT

                .getAllSubInfoList(CALLING_PACKAGE, CALLING_FEATURE);

        assertThat(subInfoList).isEmpty();

    }



    @Test

    public void testGetActiveSubscriptionInfo() {

        insertSubscription(FAKE_SUBSCRIPTION_INFO1);