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

Commit 8d3dc2e7 authored by mavishsu's avatar mavishsu Committed by Mavis Hsu
Browse files

resolve merge conflicts of 1b75d80f to pi-dev-plus-aosp 

Bug: None
Test: I solemnly swear I tested this conflict resolution.
Merged-In: I5e79d08678e1f1312c699f2c718e262a014735da
Change-Id: I34bdd2c8a9288901dfcf167337595da09b8f1c4c
parents 4412ef93 1b75d80f

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

+7 −0
Original line number Diff line number Diff line
@@ -1727,6 +1727,13 @@ public class GsmCdmaPhone extends Phone { 
            IccRecords r = mIccRecords.get();

            return (r != null) ? r.getMsisdnNumber() : null;

        } else {

            CarrierConfigManager configManager = (CarrierConfigManager)

                    mContext.getSystemService(Context.CARRIER_CONFIG_SERVICE);

            boolean use_usim = configManager.getConfigForSubId(getSubId()).getBoolean(

                    CarrierConfigManager.KEY_USE_USIM_BOOL);

            if (use_usim) {

                return (mSimRecords != null) ? mSimRecords.getMsisdnNumber() : null;

            }

            return mSST.getMdnNumber();

        }

    }

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

+26 −0
Original line number Diff line number Diff line
@@ -969,4 +969,30 @@ public class GsmCdmaPhoneTest extends TelephonyTest { 
        ss.setRilVoiceRadioTechnology(ServiceState.RIL_RADIO_TECHNOLOGY_IWLAN);

        assertEquals(mPhoneUT.getCsCallRadioTech(), ServiceState.RIL_RADIO_TECHNOLOGY_UNKNOWN);

    }



    @Test

    @SmallTest

    public void testGetLine1NumberForGsmPhone() {

        final String msisdn = "+1234567890";

        doReturn(msisdn).when(mSimRecords).getMsisdnNumber();



        switchToGsm();

        assertEquals(msisdn, mPhoneUT.getLine1Number());

    }



    @Test

    @SmallTest

    public void testGetLine1NumberForCdmaPhone() {

        final String mdn = "1234567890";

        final String msisdn = "+1234567890";

        doReturn(mdn).when(mSST).getMdnNumber();

        doReturn(msisdn).when(mSimRecords).getMsisdnNumber();



        switchToCdma();

        assertEquals(mdn, mPhoneUT.getLine1Number());



        mContextFixture.getCarrierConfigBundle().putBoolean(

                CarrierConfigManager.KEY_USE_USIM_BOOL, true);

        assertEquals(msisdn, mPhoneUT.getLine1Number());

    }

}