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

Commit fdd4e2ad authored by Hui Wang's avatar Hui Wang Committed by Automerger Merge Worker
Browse files

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

Merge "Check if the slot info is null to avoid exception" into sc-qpr1-dev am: 915fe99c am: d1e530b2 am: 2f2ee388

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15730083

Change-Id: I347b3aa0d6a87066bcdb695cdc3646676b532c27
parents e48aebfe 2f2ee388

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();

        }