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

Commit a7f4d1c2 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Use SIMRecords for setVoicemailNumber() over RuimRecords."

parents b029058a 07405cce

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

+6 −0
Original line number Diff line number Diff line
@@ -1669,7 +1669,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
@@ -403,7 +403,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();