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

Commit b053adc2 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Use SIMRecords for setVoicemailNumber() over RuimRecords." into pi-dev

parents 13691614 faa88f9f

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

+6 −0
Original line number Diff line number Diff line
@@ -1682,7 +1682,13 @@ public class GsmCdmaPhone extends Phone { 
        Message resp;

        mVmNumber = voiceMailNumber;

        resp = obtainMessage(EVENT_SET_VM_NUMBER_DONE, 0, 0, onComplete);



        IccRecords r = mIccRecords.get();



        if (!isPhoneTypeGsm() && mSimRecords != null) {

            r = mSimRecords;

        }



        if (r != null) {

            r.setVoiceMailNumber(alphaTag, mVmNumber, resp);

        }

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

+1 −1
Original line number Diff line number Diff line
@@ -487,7 +487,7 @@ public class GsmCdmaPhoneTest extends TelephonyTest { 
        // voicemail number from sharedPreference

        mPhoneUT.setVoiceMailNumber("alphaTag", voiceMailNumber, null);

        ArgumentCaptor<Message> messageArgumentCaptor = ArgumentCaptor.forClass(Message.class);

        verify(mRuimRecords).setVoiceMailNumber(eq("alphaTag"), eq(voiceMailNumber),

        verify(mSimRecords).setVoiceMailNumber(eq("alphaTag"), eq(voiceMailNumber),

                messageArgumentCaptor.capture());



        Message msg = messageArgumentCaptor.getValue();