diff options
| -rw-r--r-- | telephony/java/android/telephony/UiccCardInfo.java | 8 | ||||
| -rw-r--r-- | telephony/java/android/telephony/UiccSlotInfo.java | 16 |
2 files changed, 9 insertions, 15 deletions
diff --git a/telephony/java/android/telephony/UiccCardInfo.java b/telephony/java/android/telephony/UiccCardInfo.java index 74f9c876cc40..464389b84945 100644 --- a/telephony/java/android/telephony/UiccCardInfo.java +++ b/telephony/java/android/telephony/UiccCardInfo.java @@ -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(); } diff --git a/telephony/java/android/telephony/UiccSlotInfo.java b/telephony/java/android/telephony/UiccSlotInfo.java index a8668e7d77d4..2b1c8c863eb6 100644 --- a/telephony/java/android/telephony/UiccSlotInfo.java +++ b/telephony/java/android/telephony/UiccSlotInfo.java @@ -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(); |