Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 915fe99c authored by Hui Wang's avatar Hui Wang Committed by Android (Google) Code Review
Browse files

Merge "Check if the slot info is null to avoid exception" into sc-qpr1-dev

parents 4c76184e 3cf47555

telephony/java/android/telephony/TelephonyManager.java

+2 −1
Original line number Diff line number Diff line
@@ -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();

        }