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

Commit 3c6ea928 authored by Andy Chou's avatar Andy Chou Committed by Gerrit Code Review
Browse files

Merge "Allow override own number as voicemail number for GSM"

parents 0e4e7486 c26f0793

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

+1 −3
Original line number Diff line number Diff line
@@ -1463,7 +1463,7 @@ public class GsmCdmaPhone extends Phone { 
            }

        }



        if (!isPhoneTypeGsm() && TextUtils.isEmpty(number)) {

        if (TextUtils.isEmpty(number)) {

            // Read platform settings for dynamic voicemail number

            CarrierConfigManager configManager = (CarrierConfigManager)

                    getContext().getSystemService(Context.CARRIER_CONFIG_SERVICE);
@@ -1471,8 +1471,6 @@ public class GsmCdmaPhone extends Phone { 
            if (b != null && b.getBoolean(

                    CarrierConfigManager.KEY_CONFIG_TELEPHONY_USE_OWN_NUMBER_FOR_VOICEMAIL_BOOL)) {

                number = getLine1Number();

            } else {

                number = "*86";

            }

        }

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

+7 −3
Original line number Diff line number Diff line
@@ -397,6 +397,13 @@ public class GsmCdmaPhoneTest extends TelephonyTest { 
        // no resource or sharedPreference set -- should be null

        assertEquals(null, mPhoneUT.getVoiceMailNumber());



        // config_telephony_use_own_number_for_voicemail

        mContextFixture.getCarrierConfigBundle()

                .putBoolean(CarrierConfigManager

                        .KEY_CONFIG_TELEPHONY_USE_OWN_NUMBER_FOR_VOICEMAIL_BOOL, true);

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

        assertEquals(voiceMailNumber, mPhoneUT.getVoiceMailNumber());



        // voicemail number from config

        mContextFixture.getCarrierConfigBundle().

                putString(CarrierConfigManager.KEY_DEFAULT_VM_NUMBER_STRING, voiceMailNumber);
@@ -433,9 +440,6 @@ public class GsmCdmaPhoneTest extends TelephonyTest { 
        switchToCdma();

        String voiceMailNumber = "1234567890";



        // no resource or sharedPreference set -- should be *86

        assertEquals("*86", mPhoneUT.getVoiceMailNumber());



        // config_telephony_use_own_number_for_voicemail

        mContextFixture.getCarrierConfigBundle()

                .putBoolean(CarrierConfigManager