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

Clean up UiccPortInfo related assumptions to avoid FATAL exceptions.

Browse Source 
Test: atest FrameworksTelephonyTests
Bug: 275743638, 257088526
Change-Id: Icd652658ac53f9adabde695fa47a3e4edbffc4b7
This commit is contained in:
Muralidhar Reddy
2023-04-20 14:15:57 +00:00
parent 754fb0b4b9
commit 1f2631348b
2 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
telephony/java/android/telephony/UiccCardInfo.java
View File

@@ -166,7 +166,7 @@ public final class UiccCardInfo implements Parcelable {
+ " Please Use UiccPortInfo API instead");
}
//always return ICCID from first port.
return getPorts().stream().findFirst().get().getIccId();
return mPortList.isEmpty() ? null : mPortList.get(0).getIccId();
}
/**

13
telephony/java/android/telephony/UiccSlotInfo.java
View File

@@ -139,14 +139,16 @@ public class UiccSlotInfo implements Parcelable {
public UiccSlotInfo(boolean isEuicc, String cardId,
@CardStateInfo int cardStateInfo, boolean isExtendedApduSupported,
boolean isRemovable, @NonNull List<UiccPortInfo> portList) {
this.mIsActive = portList.get(0).isActive();
this.mIsEuicc = isEuicc;
this.mCardId = cardId;
this.mCardStateInfo = cardStateInfo;
this.mLogicalSlotIdx = portList.get(0).getLogicalSlotIndex();
this.mIsExtendedApduSupported = isExtendedApduSupported;
this.mIsRemovable = isRemovable;
this.mPortList = portList;
this.mIsActive = !portList.isEmpty() && portList.get(0).isActive();
this.mLogicalSlotIdx = portList.isEmpty()
? SubscriptionManager.INVALID_PHONE_INDEX
: portList.get(0).getLogicalSlotIndex();
}
/**
@@ -164,8 +166,7 @@ public class UiccSlotInfo implements Parcelable {
throw new UnsupportedOperationException("getIsActive() is not supported by "
+ "UiccSlotInfo. Please Use UiccPortInfo API instead");
}
//always return status from first port.
return getPorts().stream().findFirst().get().isActive();
return mIsActive;
}
public boolean getIsEuicc() {
@@ -202,9 +203,7 @@ public class UiccSlotInfo implements Parcelable {
throw new UnsupportedOperationException("getLogicalSlotIdx() is not supported by "
+ "UiccSlotInfo. Please use UiccPortInfo API instead");
}
//always return logical slot index from first port.
//portList always have at least one element.
return getPorts().stream().findFirst().get().getLogicalSlotIndex();
return mLogicalSlotIdx;
}
/**