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

Commit 8caa49ce authored by Saki Oomori's avatar Saki Oomori Committed by Masaya Nemoto
Browse files

Change voicemail number when roaming and IMS is not registered 

When following conditions are fulfilled, device uses specific voicemail
number defined in
KEY_DEFAULT_VM_NUMBER_ROAMING_AND_IMS_UNREGISTERED_STRING.

1.Network is roaming.
2.IMS is in unregistered state.
3.KEY_DEFAULT_VM_NUMBER_ROAMING_AND_IMS_UNREGISTERED_STRING has any
  value(not empty).

Bug: 118729539
Test: manual - Checked that voicemail number is changed according to
KEY_DEFAULT_VM_NUMBER_ROAMING_AND_IMS_UNREGISTERED_STRING, when IMS is
in unregistered state, and network is roaming, and
KEY_DEFAULT_VM_NUMBER_ROAMING_AND_IMS_UNREGISTERED_STRING is not empty.
Change-Id: I7a94619481061b35e8f55f2ab9f6e92706b16208
parent 8f192f22

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

+14 −4
Original line number Diff line number Diff line
@@ -1533,10 +1533,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
@@ -510,11 +510,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();
@@ -554,11 +568,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();