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

Commit fa59bd6d authored by Brad Ebinger's avatar Brad Ebinger Committed by android-build-merger
Browse files

Merge "Change voicemail number when roaming and IMS is not registered" am: 0259a2ab 

am: 5784009f

Change-Id: Idae1a63ac664c68c75278ffe92a3ccf752c83cfe
parents fd390e02 5784009f

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

+14 −4
Original line number Diff line number Diff line
@@ -1541,10 +1541,20 @@ public class GsmCdmaPhone extends Phone { 
                        b.getString(CarrierConfigManager.KEY_DEFAULT_VM_NUMBER_STRING);

                String defaultVmNumberRoaming =

                        b.getString(CarrierConfigManager.KEY_DEFAULT_VM_NUMBER_ROAMING_STRING);

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

                String defaultVmNumberRoamingAndImsUnregistered = b.getString(

                        CarrierConfigManager

                                .KEY_DEFAULT_VM_NUMBER_ROAMING_AND_IMS_UNREGISTERED_STRING);



                if (!TextUtils.isEmpty(defaultVmNumber)) number = defaultVmNumber;

                if (mSST.mSS.getRoaming()) {

                    if (!TextUtils.isEmpty(defaultVmNumberRoamingAndImsUnregistered)

                            && !mSST.isImsRegistered()) {

                        // roaming and IMS unregistered case if CC configured

                        number = defaultVmNumberRoamingAndImsUnregistered;

                    } else if (!TextUtils.isEmpty(defaultVmNumberRoaming)) {

                        // roaming default case if CC configured

                        number = defaultVmNumberRoaming;

                } else if (!TextUtils.isEmpty(defaultVmNumber)) {

                    number = defaultVmNumber;

                    }

                }

            }

        }

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

+28 −0
Original line number Diff line number Diff line
@@ -496,11 +496,25 @@ public class GsmCdmaPhoneTest extends TelephonyTest { 
        mContextFixture.getCarrierConfigBundle()

                .putString(CarrierConfigManager.KEY_DEFAULT_VM_NUMBER_ROAMING_STRING,

                        voiceMailNumberForRoaming);



        // voicemail number from config for roaming network and ims unregistered

        String voiceMailNumberForImsRoamingAndUnregistered = "1234567893";

        mContextFixture.getCarrierConfigBundle().putString(

                CarrierConfigManager.KEY_DEFAULT_VM_NUMBER_ROAMING_AND_IMS_UNREGISTERED_STRING,

                        voiceMailNumberForImsRoamingAndUnregistered);



        //Verify voicemail number for home

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

        doReturn(true).when(mSST).isImsRegistered();

        assertEquals(voiceMailNumber, mPhoneUT.getVoiceMailNumber());

        //Move to ims condition, verify voicemail number for ims unregistered

        doReturn(false).when(mSST).isImsRegistered();

        assertEquals(voiceMailNumber, mPhoneUT.getVoiceMailNumber());

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

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

        assertEquals(voiceMailNumberForImsRoamingAndUnregistered, mPhoneUT.getVoiceMailNumber());

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

        doReturn(true).when(mSST).isImsRegistered();

        assertEquals(voiceMailNumberForRoaming, mPhoneUT.getVoiceMailNumber());

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

        doReturn(false).when(mSST.mSS).getRoaming();
@@ -540,11 +554,25 @@ public class GsmCdmaPhoneTest extends TelephonyTest { 
        mContextFixture.getCarrierConfigBundle()

                .putString(CarrierConfigManager.KEY_DEFAULT_VM_NUMBER_ROAMING_STRING,

                        voiceMailNumberForRoaming);



        // voicemail number from config for roaming network and ims unregistered

        String voiceMailNumberForImsRoamingAndUnregistered = "1234567893";

        mContextFixture.getCarrierConfigBundle().putString(

                CarrierConfigManager.KEY_DEFAULT_VM_NUMBER_ROAMING_AND_IMS_UNREGISTERED_STRING,

                        voiceMailNumberForImsRoamingAndUnregistered);



        //Verify voicemail number for home

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

        doReturn(true).when(mSST).isImsRegistered();

        assertEquals(voiceMailNumber, mPhoneUT.getVoiceMailNumber());

        //Move to ims condition, verify voicemail number for ims unregistered

        doReturn(false).when(mSST).isImsRegistered();

        assertEquals(voiceMailNumber, mPhoneUT.getVoiceMailNumber());

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

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

        assertEquals(voiceMailNumberForImsRoamingAndUnregistered, mPhoneUT.getVoiceMailNumber());

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

        doReturn(true).when(mSST).isImsRegistered();

        assertEquals(voiceMailNumberForRoaming, mPhoneUT.getVoiceMailNumber());

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

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