Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c5e8f49e authored by sandeepjs's avatar sandeepjs
Browse files

[MEP] Reverting temporarily bypassed exception 

Reverting temporarily bypassed exceptions.
Bug: 202110963
Test: Build

Change-Id: Ib1a9d228a1d3d9864e03d3afa54cd85574ed8fe8
parent b1866650

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();

    }

telephony/java/android/telephony/UiccSlotInfo.java

+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();