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

Commit 02daf59c authored by Amit Mahajan's avatar Amit Mahajan Committed by android-build-merger
Browse files

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

am: b053adc2

Change-Id: I620eb20987a1292a3759906d39049039de832486
parents 91845b47 b053adc2

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

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