diff --git a/telephony/java/android/telephony/UiccCardInfo.java b/telephony/java/android/telephony/UiccCardInfo.java index 7dfe450fdb1ab..0dfab1838c595 100644 --- a/telephony/java/android/telephony/UiccCardInfo.java +++ b/telephony/java/android/telephony/UiccCardInfo.java @@ -156,9 +156,11 @@ public final class UiccCardInfo implements Parcelable { @Nullable @Deprecated public String getIccId() { - if (mIccIdAccessRestricted) { - throw new UnsupportedOperationException("getIccId from UiccPortInfo"); - } + // Temporarily bypassing exception + // TODO: add exception once refactoring completed. + //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 2b1c8c863eb66..a8668e7d77d40 100644 --- a/telephony/java/android/telephony/UiccSlotInfo.java +++ b/telephony/java/android/telephony/UiccSlotInfo.java @@ -159,9 +159,11 @@ public class UiccSlotInfo implements Parcelable { */ @Deprecated public boolean getIsActive() { - if (mLogicalSlotAccessRestricted) { - throw new UnsupportedOperationException("get port status from UiccPortInfo"); - } + // Temporarily bypassing exception + // TODO: add exception once refactoring completed. + //if (mLogicalSlotAccessRestricted) { + // throw new UnsupportedOperationException("get port status from UiccPortInfo"); + //} //always return status from first port. return getPorts().stream().findFirst().get().isActive(); } @@ -196,9 +198,11 @@ public class UiccSlotInfo implements Parcelable { */ @Deprecated public int getLogicalSlotIdx() { - if (mLogicalSlotAccessRestricted) { - throw new UnsupportedOperationException("get logical slot index from UiccPortInfo"); - } + // Temporarily bypassing exception + // TODO: add exception once refactoring completed. + //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();