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

Merge "[MEP] Reverting temporarily bypassed exception"

Browse Source
This commit is contained in:
Chen Xu
2022-01-12 00:04:55 +00:00
committed by Android (Google) Code Review
parent 5c233dfcaa c5e8f49ea9
commit e503303146
2 changed files with 9 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -156,11 +156,9 @@ public final class UiccCardInfo implements Parcelable {
@Nullable
@Deprecated
public String getIccId() {
// Temporarily bypassing exception
// TODO: add exception once refactoring completed.
//if (mIccIdAccessRestricted) {
// throw new UnsupportedOperationException("getIccId from UiccPortInfo");
//}
if (mIccIdAccessRestricted) {
throw new UnsupportedOperationException("getIccId from UiccPortInfo");
}
//always return ICCID from first port.
return getPorts().stream().findFirst().get().getIccId();
}

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

@@ -159,11 +159,9 @@ public class UiccSlotInfo implements Parcelable {
*/
@Deprecated
public boolean getIsActive() {
// Temporarily bypassing exception
// TODO: add exception once refactoring completed.
//if (mLogicalSlotAccessRestricted) {
// throw new UnsupportedOperationException("get port status from UiccPortInfo");
//}
if (mLogicalSlotAccessRestricted) {
throw new UnsupportedOperationException("get port status from UiccPortInfo");
}
//always return status from first port.
return getPorts().stream().findFirst().get().isActive();
}
@@ -198,11 +196,9 @@ public class UiccSlotInfo implements Parcelable {
*/
@Deprecated
public int getLogicalSlotIdx() {
// Temporarily bypassing exception
// TODO: add exception once refactoring completed.
//if (mLogicalSlotAccessRestricted) {
// throw new UnsupportedOperationException("get logical slot index from UiccPortInfo");
//}
if (mLogicalSlotAccessRestricted) {
throw new UnsupportedOperationException("get logical slot index from UiccPortInfo");
}
//always return logical slot index from first port.
//portList always have at least one element.
return getPorts().stream().findFirst().get().getLogicalSlotIndex();