Commit 36b4b6dd authored Oct 12, 2020 by Treehugger Robot Committed by Automerger Merge Worker Oct 12, 2020

Merge "Fixed NPE when EF_EHPLMN does not exist" am: 6c721e6c am: 43c93714...

Merge "Fixed NPE when EF_EHPLMN does not exist" am: 6c721e6c am: 43c93714 am: b1811ef6 am: b26961ed

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

Change-Id: I1ab8137834c3dfbb222342b8e925969ea026a715

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -4483,7 +4483,7 @@ public class GsmCdmaPhone extends Phone {
		public @NonNull List<String> getEquivalentHomePlmns() {
		if (isPhoneTypeGsm()) {
		IccRecords r = mIccRecords.get();
		if (r != null) {
		if (r != null && r.getEhplmns() != null) {
		return Arrays.asList(r.getEhplmns());
		}
		} else if (isPhoneTypeCdma()) {