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

Commit 7ce0d431 authored by Tyler Gunn's avatar Tyler Gunn
Browse files

Add null-check for country ISO. 

subInfo.getCountryIso() can be null and cause toUpperCase to fail.

Test: Compile
Fixes: 134987898
Change-Id: Id33c3e0d82522c431c862511dca4608c853d0ca1
parent a521114a

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

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