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

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

Merge "Add null-check for country ISO." 

am: 1eb07a92

Change-Id: I507ed36b09fdea6d6a927e84c31f610c8088aae4
parents b29e2d4a 1eb07a92

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();