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

Commit 7b9fe52f authored by Andy Chou's avatar Andy Chou Committed by Android (Google) Code Review
Browse files

Merge "Specifies the carrier's default voicemail number for roaming network." into pi-dev

parents b70049a3 960cd06c

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

+5 −1
Original line number Diff line number Diff line
@@ -1381,7 +1381,11 @@ public class GsmCdmaPhone extends Phone { 
            if (b != null) {

                String defaultVmNumber =

                        b.getString(CarrierConfigManager.KEY_DEFAULT_VM_NUMBER_STRING);

                if (!TextUtils.isEmpty(defaultVmNumber)) {

                String defaultVmNumberRoaming =

                        b.getString(CarrierConfigManager.KEY_DEFAULT_VM_NUMBER_ROAMING_STRING);

                if (!TextUtils.isEmpty(defaultVmNumberRoaming) && mSST.mSS.getRoaming()) {

                    number = defaultVmNumberRoaming;

                } else {

                    number = defaultVmNumber;

                }

            }

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

+30 −0
Original line number Diff line number Diff line
@@ -366,6 +366,21 @@ public class GsmCdmaPhoneTest extends TelephonyTest { 
                putString(CarrierConfigManager.KEY_DEFAULT_VM_NUMBER_STRING, voiceMailNumber);

        assertEquals(voiceMailNumber, mPhoneUT.getVoiceMailNumber());



        // voicemail number from config for roaming network

        String voiceMailNumberForRoaming = "1234567892";

        mContextFixture.getCarrierConfigBundle()

                .putString(CarrierConfigManager.KEY_DEFAULT_VM_NUMBER_ROAMING_STRING,

                        voiceMailNumberForRoaming);

        //Verify voicemail number for home

        doReturn(false).when(mSST.mSS).getRoaming();

        assertEquals(voiceMailNumber, mPhoneUT.getVoiceMailNumber());

        //Move to roaming condition, verify voicemail number for roaming

        doReturn(true).when(mSST.mSS).getRoaming();

        assertEquals(voiceMailNumberForRoaming, mPhoneUT.getVoiceMailNumber());

        //Move to home condition, verify voicemail number for home

        doReturn(false).when(mSST.mSS).getRoaming();

        assertEquals(voiceMailNumber, mPhoneUT.getVoiceMailNumber());



        // voicemail number that is explicitly set

        voiceMailNumber = "1234567891";

        mPhoneUT.setVoiceMailNumber("alphaTag", voiceMailNumber, null);
@@ -398,6 +413,21 @@ public class GsmCdmaPhoneTest extends TelephonyTest { 
                putString(CarrierConfigManager.KEY_DEFAULT_VM_NUMBER_STRING, voiceMailNumber);

        assertEquals(voiceMailNumber, mPhoneUT.getVoiceMailNumber());



        // voicemail number from config for roaming network

        String voiceMailNumberForRoaming = "1234567892";

        mContextFixture.getCarrierConfigBundle()

                .putString(CarrierConfigManager.KEY_DEFAULT_VM_NUMBER_ROAMING_STRING,

                        voiceMailNumberForRoaming);

        //Verify voicemail number for home

        doReturn(false).when(mSST.mSS).getRoaming();

        assertEquals(voiceMailNumber, mPhoneUT.getVoiceMailNumber());

        //Move to roaming condition, verify voicemail number for roaming

        doReturn(true).when(mSST.mSS).getRoaming();

        assertEquals(voiceMailNumberForRoaming, mPhoneUT.getVoiceMailNumber());

        //Move to home condition, verify voicemail number for home

        doReturn(false).when(mSST.mSS).getRoaming();

        assertEquals(voiceMailNumber, mPhoneUT.getVoiceMailNumber());



        // voicemail number from sharedPreference

        mPhoneUT.setVoiceMailNumber("alphaTag", voiceMailNumber, null);

        ArgumentCaptor<Message> messageArgumentCaptor = ArgumentCaptor.forClass(Message.class);