From 3cf475553e3933fb1c150cfba3bb57b8ca41b4d9 Mon Sep 17 00:00:00 2001
From: Hui Wang <huiwang@google.com>
Date: Tue, 31 Aug 2021 10:49:59 -0700
Subject: [PATCH] Check if the slot info is null to avoid exception

Bug: 198298029
Test: manual
Change-Id: Id5ad70e24ee2ddbb0e4910257e298c33709044a0
---
 telephony/java/android/telephony/TelephonyManager.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java
index 255a61266ebfe..8f3172a14074d 100644
--- a/telephony/java/android/telephony/TelephonyManager.java
+++ b/telephony/java/android/telephony/TelephonyManager.java
@@ -3483,7 +3483,8 @@ public class TelephonyManager {
      */
     private int getLogicalSlotIndex(int physicalSlotIndex) {
         UiccSlotInfo[] slotInfos = getUiccSlotsInfo();
-        if (slotInfos != null && physicalSlotIndex >= 0 && physicalSlotIndex < slotInfos.length) {
+        if (slotInfos != null && physicalSlotIndex >= 0 && physicalSlotIndex < slotInfos.length
+                && slotInfos[physicalSlotIndex] != null) {
             return slotInfos[physicalSlotIndex].getLogicalSlotIdx();
         }