commit 6723f9883a3a2d02142c04298c1fb3aee2c0aa46
author Holly Jiuyu Sun <jiuyu@google.com> Mon Jun 04 15:48:38 2018 -0700
committer Holly Jiuyu Sun <jiuyu@google.com> Mon Jun 04 17:23:54 2018 -0700
tree d43f6366ee89770a38b2c68752f4db421d9f14ff
parent fc261fe3f914ae671aa4fbec0a4c8716e5d62b78

Add null check for slot to avoid phone process crashes.

Bug: 80299566
Test: test on phone
Change-Id: I06aec4ed1e1009a5efe219545799d45ca7ab6726

src/com/android/phone/PhoneInterfaceManager.java

diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java
index 613d160..ae3ec4e 100755
--- a/src/com/android/phone/PhoneInterfaceManager.java
+++ b/src/com/android/phone/PhoneInterfaceManager.java
@@ -4211,6 +4211,9 @@
         UiccSlotInfo[] infos = new UiccSlotInfo[slots.length];
         for (int i = 0; i < slots.length; i++) {
             UiccSlot slot = slots[i];
+            if (slot == null) {
+                continue;
+            }
 
             String cardId;
             UiccCard card = slot.getUiccCard();