Merge "[MEP] Reverting temporarily bypassed exception" (e5033031) · Commits · e / os / android_frameworks_base

telephony/java/android/telephony/UiccCardInfo.java

+3 −5

Original line number	Diff line number	Diff line
		@@ -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();
		}

+6 −10

Original line number	Diff line number	Diff line
		@@ -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();