commit 6291c47b7474c6a7cccf2851f1bc96fecc0b4899
author chen xu <fionaxu@google.com> Mon Feb 04 12:55:53 2019 -0800
committer chen xu <fionaxu@google.com> Mon Feb 04 14:59:08 2019 -0800
tree c2b61b038c2ef9ad9cbdaff2ce04b0d9f1ac7eb5
parent c6e82f20181371a0a286cc9aefe601ab82fd6ccf

fix NPE when sim is absent

Bug: 123775402
Test: Manual
Change-Id: Ibf557b576c6249605e8e293c4c5b3377a9d2a286

src/com/android/phone/PhoneInterfaceManager.java

diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java
index 1631b64..7533c25 100755
--- a/src/com/android/phone/PhoneInterfaceManager.java
+++ b/src/com/android/phone/PhoneInterfaceManager.java
@@ -5132,6 +5132,10 @@
         try {
             final SubscriptionInfo info = mSubscriptionController.getActiveSubscriptionInfo(subId,
                     phone.getContext().getOpPackageName());
+            if (info == null) {
+                log("getSimLocaleForSubscriber, inactive subId: " + subId);
+                return null;
+            }
             // Try and fetch the locale from the carrier properties or from the SIM language
             // preferences (EF-PL and EF-LI)...
             final int mcc = info.getMcc();