Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: Iae4779481490e6390a6be39c1c4c823c4fd193b5
This commit is contained in:
Hui Wang
2021-09-01 21:21:51 +00:00
committed by Automerger Merge Worker
parent b7e36190f6 915fe99ce4
commit d1e530b2e0
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
telephony/java/android/telephony/TelephonyManager.java
View File

@@ -3483,7 +3483,8 @@ public class TelephonyManager {
*/ */
private int getLogicalSlotIndex(int physicalSlotIndex) { private int getLogicalSlotIndex(int physicalSlotIndex) {
UiccSlotInfo[] slotInfos = getUiccSlotsInfo(); 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(); return slotInfos[physicalSlotIndex].getLogicalSlotIdx();
} }