commit 6358bc3999bddad4ca9f427e1488eab897424da5
author Muralidhar Reddy Mule <muralidharm@google.com> Tue Jan 18 09:10:10 2022 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Jan 18 09:10:10 2022 +0000
tree c5a05cceef6cb130969c3261d0ddc4770ae01eef
parent c7dd206d6f72bf8267625e7e226189e09c80f783
parent d196bbfa46cc8c3dc6315486248183e1f806da9b

Merge "IndexOutOfBoundsException is thrown during UiccSlotInfo object creation"

src/com/android/phone/PhoneInterfaceManager.java

diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java
index 4da4004..8f48501 100755
--- a/src/com/android/phone/PhoneInterfaceManager.java
+++ b/src/com/android/phone/PhoneInterfaceManager.java
@@ -9002,8 +9002,8 @@
         final long identity = Binder.clearCallingIdentity();
         try {
             UiccSlot[] slots = UiccController.getInstance().getUiccSlots();
-            if (slots == null) {
-                Rlog.i(LOG_TAG, "slots is null.");
+            if (slots == null || slots.length == 0) {
+                Rlog.i(LOG_TAG, "slots is null or empty.");
                 return null;
             }
             UiccSlotInfo[] infos = new UiccSlotInfo[slots.length];