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

Commit 72204daa authored by Xi Han's avatar Xi Han Committed by Android (Google) Code Review
Browse files

Merge "Migrate flag config_telephony_use_own_number_for_voicemail to Carrier Config."

parents 8cc7f5b3 c75caec8

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

+5 −2
Original line number Diff line number Diff line
@@ -1406,8 +1406,11 @@ public class GsmCdmaPhone extends Phone { 


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

            // Read platform settings for dynamic voicemail number

            if (getContext().getResources().getBoolean(com.android.internal

                    .R.bool.config_telephony_use_own_number_for_voicemail)) {

            CarrierConfigManager configManager = (CarrierConfigManager)

                    getContext().getSystemService(Context.CARRIER_CONFIG_SERVICE);

            PersistableBundle b = configManager.getConfig();

            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

+3 −2
Original line number Diff line number Diff line
@@ -377,8 +377,9 @@ public class GsmCdmaPhoneTest extends TelephonyTest { 
        assertEquals("*86", mPhoneUT.getVoiceMailNumber());



        // config_telephony_use_own_number_for_voicemail

        mContextFixture.putBooleanResource(

                com.android.internal.R.bool.config_telephony_use_own_number_for_voicemail, true);

        mContextFixture.getCarrierConfigBundle()

                .putBoolean(CarrierConfigManager

                                .KEY_CONFIG_TELEPHONY_USE_OWN_NUMBER_FOR_VOICEMAIL_BOOL, true);

        doReturn(voiceMailNumber).when(mSST).getMdnNumber();

        assertEquals(voiceMailNumber, mPhoneUT.getVoiceMailNumber());