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

Commit ca8a242f authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Change excepted result on R for testVoiceMailNumber" am: ade0160e am: b9178bd4 

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/1357845

Change-Id: Ibe512618d0e8e40b75ba9ecfb0dcd0f9259c89e3
parents 4f6b2849 b9178bd4

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

+2 −2
Original line number Diff line number Diff line
@@ -1726,8 +1726,8 @@ public class GsmCdmaPhone extends Phone { 
    public String getVoiceMailAlphaTag() {

        String ret = "";



        if (isPhoneTypeGsm()) {

            IccRecords r = mIccRecords.get();

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

            IccRecords r = isPhoneTypeGsm() ? mIccRecords.get() : mSimRecords;



            ret = (r != null) ? r.getVoiceMailAlphaTag() : "";

        }