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

Commit 0d01e874 authored by Andy Chou's avatar Andy Chou Committed by android-build-merger
Browse files

Merge "Allow override own number as voicemail number for GSM" am: 3c6ea928 am: 4f1938af 

am: 9d6c7280

Change-Id: I0cd60dec4edf1cfb6805d201eb0dcbfbe098dfbd
parents 9f274178 9d6c7280

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

+1 −3
Original line number Diff line number Diff line
@@ -1481,7 +1481,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);
@@ -1489,8 +1489,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
@@ -398,6 +398,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);
@@ -434,9 +441,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