Merge "Fix null pointer in SubscriptionUtil" into qt-dev am: 30d0e6c7d7

am: ac690d98c0 Change-Id: I69b7f210bbbef2bba3ef6792c128b806db07e90e
2019-05-01 16:01:49 -07:00
parent e2f2b15837 ac690d98c0
commit 1600a5ce1a
2 changed files with 10 additions and 1 deletions
--- a/src/com/android/settings/network/SubscriptionUtil.java
+++ b/src/com/android/settings/network/SubscriptionUtil.java
@@ -59,7 +59,11 @@ public class SubscriptionUtil {
        return subscriptions;
    }

-    private static boolean isInactiveInsertedPSim(UiccSlotInfo slotInfo) {
+    @VisibleForTesting
+    static boolean isInactiveInsertedPSim(UiccSlotInfo slotInfo) {
+        if (slotInfo == null)  {
+            return false;
+        }
        return !slotInfo.getIsEuicc() && !slotInfo.getIsActive() &&
                slotInfo.getCardStateInfo() == CARD_STATE_INFO_PRESENT;
    }