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

Commit 38269852 authored by Tyler Gunn's avatar Tyler Gunn Committed by android-build-merger
Browse files

Merge "Add null-check for country ISO." am: 1eb07a92 am: 3b666e0d 

am: 114db8a5

Change-Id: I64eb0ba7e62a0dd7adb9ad3e28105710184bef7a
parents b400c624 114db8a5

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

+1 −1
Original line number Diff line number Diff line
@@ -3774,7 +3774,7 @@ public class GsmCdmaPhone extends Phone { 
        int subId = getSubId();

        SubscriptionInfo subInfo = SubscriptionManager.from(getContext())

                .getActiveSubscriptionInfo(subId);

        if (subInfo == null) {

        if (subInfo == null || TextUtils.isEmpty(subInfo.getCountryIso())) {

            return null;

        }

        return subInfo.getCountryIso().toUpperCase();