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

Commit 44b5bb7e authored by Jack Yu's avatar Jack Yu Committed by Automerger Merge Worker
Browse files

Merge "Fixed incorrect phone number from inactive subscription" into... 

Merge "Fixed incorrect phone number from inactive subscription" into udc-qpr-dev am: 1897d17a am: 8e9437f7

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



Change-Id: Id9c24851d44620df24e25d3580739d6fc57d9112
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 0d6f4709 8e9437f7

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

+2 −2
Original line number Diff line number Diff line
@@ -1394,7 +1394,7 @@ public class SubscriptionManagerService extends ISub.Stub { 
                        loge("updateSubscription: sim country iso is null");

                    }



                    String msisdn = mTelephonyManager.getLine1Number(subId);

                    String msisdn = PhoneFactory.getPhone(phoneId).getLine1Number();

                    if (!TextUtils.isEmpty(msisdn)) {

                        setDisplayNumber(msisdn, subId);

                    }
@@ -3391,7 +3391,7 @@ public class SubscriptionManagerService extends ISub.Stub { 
        try {

            switch(source) {

                case SubscriptionManager.PHONE_NUMBER_SOURCE_UICC:

                    Phone phone = PhoneFactory.getPhone(getPhoneId(subId));

                    Phone phone = PhoneFactory.getPhone(getSlotIndex(subId));

                    if (phone != null) {

                        return TextUtils.emptyIfNull(phone.getLine1Number());

                    } else {

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

+20 −1
Original line number Diff line number Diff line
@@ -167,6 +167,7 @@ public class SubscriptionManagerServiceTest extends TelephonyTest { 
        // Dual-SIM configuration

        mPhones = new Phone[] {mPhone, mPhone2};

        replaceInstance(PhoneFactory.class, "sPhones", null, mPhones);

        doReturn(FAKE_PHONE_NUMBER1).when(mPhone).getLine1Number();

        doReturn(2).when(mTelephonyManager).getActiveModemCount();

        doReturn(2).when(mTelephonyManager).getSupportedModemCount();

        doReturn(mUiccProfile).when(mPhone2).getIccCard();
@@ -1869,7 +1870,6 @@ public class SubscriptionManagerServiceTest extends TelephonyTest { 


        doReturn(FAKE_IMSI1).when(mTelephonyManager).getSubscriberId();

        doReturn(FAKE_MCC1 + FAKE_MNC1).when(mTelephonyManager).getSimOperatorNumeric(anyInt());

        doReturn(FAKE_PHONE_NUMBER1).when(mTelephonyManager).getLine1Number(anyInt());

        doReturn(FAKE_EHPLMNS1.split(",")).when(mSimRecords).getEhplmns();

        doReturn(FAKE_HPLMNS1.split(",")).when(mSimRecords).getPlmnsFromHplmnActRecord();

        doReturn(0).when(mUiccSlot).getPortIndexFromIccId(anyString());
@@ -1947,6 +1947,24 @@ public class SubscriptionManagerServiceTest extends TelephonyTest { 
                .isEmpty();

    }



    @Test

    public void testGetPhoneNumberFromInactiveSubscription() {

        mContextFixture.addCallingOrSelfPermission(Manifest.permission.READ_PRIVILEGED_PHONE_STATE);

        testInactiveSimRemoval();



        int subId = insertSubscription(FAKE_SUBSCRIPTION_INFO1);

        assertThat(subId).isEqualTo(2);

        assertThat(mSubscriptionManagerServiceUT.getActiveSubIdList(false)).hasLength(1);

        assertThat(mSubscriptionManagerServiceUT.getAllSubInfoList(CALLING_PACKAGE,

                CALLING_FEATURE)).hasSize(2);



        assertThat(mSubscriptionManagerServiceUT.getPhoneNumberFromFirstAvailableSource(1,

                CALLING_PACKAGE, CALLING_FEATURE)).isEqualTo(FAKE_PHONE_NUMBER2);

        assertThat(mSubscriptionManagerServiceUT.getPhoneNumber(1,

                SubscriptionManager.PHONE_NUMBER_SOURCE_UICC, CALLING_PACKAGE, CALLING_FEATURE))

                .isEqualTo(FAKE_PHONE_NUMBER2);

    }



    @Test

    public void testDeleteEsim() {

        mContextFixture.addCallingOrSelfPermission(Manifest.permission.READ_PRIVILEGED_PHONE_STATE);
@@ -2035,6 +2053,7 @@ public class SubscriptionManagerServiceTest extends TelephonyTest { 
                0, TelephonyManager.SIM_STATE_READY, null, null);

        processAllMessages();



        mContextFixture.addCallingOrSelfPermission(Manifest.permission.MODIFY_PHONE_STATE);

        mSubscriptionManagerServiceUT.updateSimState(

                0, TelephonyManager.SIM_STATE_LOADED, null, null);

        processAllMessages();