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

Commit 4ea01903 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Merge cherrypicks of [6716922, 6716923, 6716413, 6717023, 6717024, 6716716,... 

Merge cherrypicks of [6716922, 6716923, 6716413, 6717023, 6717024, 6716716, 6715859, 6717160, 6717161, 6717162, 6717163, 6716295, 6717141, 6717181, 6717183, 6717184, 6717185, 6714937, 6717028, 6716717, 6716927, 6717200, 6717029, 6717030, 6717031, 6717032, 6717033, 6716928, 6717034, 6717035, 6716929, 6717201, 6716930, 6712377, 6712378, 6716643, 6717164, 6712379] into pi-qpr3-release

Change-Id: Ifd0a46247b40df11c6ccbdc1d5a26031845445f0
parents 21b963e4 42e7097a

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

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

            IccRecords r = mIccRecords.get();

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

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

        } else {

        } 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();

            return mSST.getMdnNumber();

        }

        }

    }

    }

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

+26 −0
Original line number Original line Diff line number Diff line
@@ -957,4 +957,30 @@ public class GsmCdmaPhoneTest extends TelephonyTest { 
        assertEquals(EVENT_SET_ICC_LOCK_ENABLED, message.what);

        assertEquals(EVENT_SET_ICC_LOCK_ENABLED, message.what);

        assertTrue(ret.exception != null);

        assertTrue(ret.exception != null);

    }

    }



    @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());

    }

}
 
}