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

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

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

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

Change-Id: Ie2b42d845283fdacaa24490bfd6faf9486a3a026
parents 4dce2e39 b1811ef6

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

+1 −1
Original line number Diff line number Diff line
@@ -4482,7 +4482,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()) {