PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

To avoid the NullPointerException of UiccSlotInfo

Browse Source 
Bug: 307599094
Test: Build pass
Change-Id: Ia3b8d29b37f2c9616856e9448c9f346b81229534
This commit is contained in:
SongFerngWang
2023-10-31 19:51:05 +08:00
parent b271e84e42
commit 0ba519f1b4
3 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/com/android/settings/network/UiccSlotUtil.java
View File

@@ -301,7 +301,8 @@ public class UiccSlotUtil {
}
if (slotId == INVALID_PHYSICAL_SLOT_ID) {
for (int i = 0; i < slots.length; i++) {
if (slots[i].isRemovable()
if (slots[i] != null
&& slots[i].isRemovable()
&& !slots[i].getIsEuicc()
&& !slots[i].getPorts().stream().findFirst().get().isActive()
&& slots[i].getCardStateInfo() != UiccSlotInfo.CARD_STATE_INFO_ERROR
@@ -310,8 +311,9 @@ public class UiccSlotUtil {
}
}
} else {
if (slotId >= slots.length || !slots[slotId].isRemovable()) {
throw new UiccSlotsException("The given slotId is not a removable slot: " + slotId);
if (slotId >= slots.length || slots[slotId] == null || !slots[slotId].isRemovable()) {
Log.d(TAG, "The given slotId is not a removable slot: " + slotId);
return INVALID_PHYSICAL_SLOT_ID;
}
if (!slots[slotId].getPorts().stream().findFirst().get().isActive()) {
return slotId;