Commit e6deaf2e authored Jul 09, 2020 by Treehugger Robot Committed by Automerger Merge Worker Jul 09, 2020

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

Merge "Change excepted result on R for testVoiceMailNumber" am: ade0160e am: b9178bd4 am: ca8a242f am: ca132b32 am: 9fccbc31

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

Change-Id: Ic5f9528d549a7ba793464a5187806dac166555ce

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

+2 −2

Original line number	Diff line number	Diff line
		@@ -1728,8 +1728,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() : "";
		}