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

Commit 1eb07a92 authored by Tyler Gunn's avatar Tyler Gunn Committed by Gerrit Code Review
Browse files

Merge "Add null-check for country ISO."

parents 0f3dbb7f 7ce0d431

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

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