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

[MEP] Reverting temporarily bypassed exception

Browse Source 
Reverting temporarily bypassed exceptions.
Bug: 202110963
Test: Build

Change-Id: Ib1a9d228a1d3d9864e03d3afa54cd85574ed8fe8
This commit is contained in:
sandeepjs
2022-01-11 15:38:19 +00:00
parent b1866650e5
commit c5e8f49ea9
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();