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

Commit 3c2d3e9f authored by Sergio Rodriguez Orama's avatar Sergio Rodriguez Orama Committed by Android (Google) Code Review
Browse files

Merge "Revert "[MEP] Enable iccCloseLogicalChannelWithSessionInfo API"" into udc-dev

parents 0f799a09 0bfdbaff

src/java/com/android/internal/telephony/RadioSimProxy.java

+8 −5
Original line number Diff line number Diff line
@@ -283,11 +283,14 @@ public class RadioSimProxy extends RadioServiceProxy { 
        if (isEmpty()) return;

        if (isAidl()) {

            if (mHalVersion.greaterOrEqual(RIL.RADIO_HAL_VERSION_2_1)) {

                android.hardware.radio.sim.SessionInfo info =

                        new android.hardware.radio.sim.SessionInfo();

                info.sessionId = channelId;

                info.isEs10 = isEs10;

                mSimProxy.iccCloseLogicalChannelWithSessionInfo(serial, info);

                // TODO: [MEP-A1] Use iccCloseLogicalChannelWithSessionInfo API once vendor

                //  changes are completed.

                //android.hardware.radio.sim.SessionInfo info =

                //        new android.hardware.radio.sim.SessionInfo();

                //info.sessionId = channelId;

                //info.isEs10 = isEs10;

                //mSimProxy.iccCloseLogicalChannelWithSessionInfo(serial, info);

                mSimProxy.iccCloseLogicalChannel(serial, channelId);

                return;

            }

            mSimProxy.iccCloseLogicalChannel(serial, channelId);