commit 1eb07a920d581b2b1f76be3510c816444e3e11bd
author Tyler Gunn <tgunn@google.com> Thu Jun 20 20:01:38 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Jun 20 20:01:38 2019 +0000
tree b2e82461736d7988f20104d0236a765359094231
parent 0f3dbb7fc07a2ea3913a033d5accbb0ade75bf3c
parent 7ce0d43135c29d4270634b38131338bf3cc60d58

Merge "Add null-check for country ISO."

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

diff --git a/src/java/com/android/internal/telephony/GsmCdmaPhone.java b/src/java/com/android/internal/telephony/GsmCdmaPhone.java
index eb983b6..8fb399d 100644
--- a/src/java/com/android/internal/telephony/GsmCdmaPhone.java
+++ b/src/java/com/android/internal/telephony/GsmCdmaPhone.java
@@ -3756,7 +3756,7 @@
         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();