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

Commit bd9734a4 authored by Jordan Liu's avatar Jordan Liu Committed by Gerrit Code Review
Browse files

Merge "Update reference to config_default_vm_number"

parents be6ba3c6 f271e166

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

+8 −17
Original line number Diff line number Diff line
@@ -1289,23 +1289,14 @@ public class GsmCdmaPhone extends Phone { 
        }



        if (TextUtils.isEmpty(number)) {

            String[] listArray = getContext().getResources()

                .getStringArray(com.android.internal.R.array.config_default_vm_number);

            if (listArray != null && listArray.length > 0) {

                for (int i=0; i<listArray.length; i++) {

                    if (!TextUtils.isEmpty(listArray[i])) {

                        String[] defaultVMNumberArray = listArray[i].split(";");

                        if (defaultVMNumberArray != null && defaultVMNumberArray.length > 0) {

                            if (defaultVMNumberArray.length == 1) {

                                number = defaultVMNumberArray[0];

                            } else if (defaultVMNumberArray.length == 2 &&

                                    !TextUtils.isEmpty(defaultVMNumberArray[1]) &&

                                    isMatchGid(defaultVMNumberArray[1])) {

                                number = defaultVMNumberArray[0];

                                break;

                            }

                        }

                    }

            CarrierConfigManager configManager = (CarrierConfigManager)

                    getContext().getSystemService(Context.CARRIER_CONFIG_SERVICE);

            PersistableBundle b = configManager.getConfig();

            if (b != null) {

                String defaultVmNumber =

                        b.getString(CarrierConfigManager.KEY_DEFAULT_VM_NUMBER_STRING);

                if (!TextUtils.isEmpty(defaultVmNumber)) {

                    number = defaultVmNumber;

                }

            }

        }

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

+4 −6
Original line number Diff line number Diff line
@@ -344,9 +344,8 @@ public class GsmCdmaPhoneTest extends TelephonyTest { 
        assertEquals(null, mPhoneUT.getVoiceMailNumber());



        // voicemail number from config

        mContextFixture.putStringArrayResource(

                com.android.internal.R.array.config_default_vm_number,

                new String[]{voiceMailNumber});

        mContextFixture.getCarrierConfigBundle().

                putString(CarrierConfigManager.KEY_DEFAULT_VM_NUMBER_STRING, voiceMailNumber);

        assertEquals(voiceMailNumber, mPhoneUT.getVoiceMailNumber());



        // voicemail number that is explicitly set
@@ -376,9 +375,8 @@ public class GsmCdmaPhoneTest extends TelephonyTest { 


        // voicemail number from config

        voiceMailNumber = "1234567891";

        mContextFixture.putStringArrayResource(

                com.android.internal.R.array.config_default_vm_number,

                new String[]{voiceMailNumber});

        mContextFixture.getCarrierConfigBundle().

                putString(CarrierConfigManager.KEY_DEFAULT_VM_NUMBER_STRING, voiceMailNumber);

        assertEquals(voiceMailNumber, mPhoneUT.getVoiceMailNumber());



        // voicemail number from sharedPreference