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

Commit 387132c5 authored by Jordan Liu's avatar Jordan Liu Committed by Automerger Merge Worker
Browse files

Merge "Implement setSimPowerState" am: 67ba01ff 

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/1518964

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0a7c8688109b890682e9d7a7dc1d34f7022c911d
parents 3085a474 67ba01ff

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

+2 −2
Original line number Diff line number Diff line
@@ -4370,8 +4370,8 @@ public abstract class Phone extends Handler implements PhoneInternalInterface { 
     * - {@link android.telephony.TelephonyManager#CARD_POWER_UP}

     * - {@link android.telephony.TelephonyManager#CARD_POWER_UP_PASS_THROUGH}

     **/

    public void setSimPowerState(int state, WorkSource workSource) {

        mCi.setSimCardPower(state, null, workSource);

    public void setSimPowerState(int state, Message result, WorkSource workSource) {

        mCi.setSimCardPower(state, result, workSource);

    }



    public void setCarrierTestOverride(String mccmnc, String imsi, String iccid, String gid1,

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

+18 −10
Original line number Diff line number Diff line
@@ -4215,7 +4215,7 @@ public class RIL extends BaseCommands implements CommandsInterface { 


    @Override

    public void getCellInfoList(Message result, WorkSource workSource) {

        workSource = getDeafultWorkSourceIfInvalid(workSource);

        workSource = getDefaultWorkSourceIfInvalid(workSource);

        IRadio radioProxy = getRadioProxy(result);

        if (radioProxy != null) {

            RILRequest rr = obtainRequest(RIL_REQUEST_GET_CELL_INFO_LIST, result,
@@ -4242,7 +4242,7 @@ public class RIL extends BaseCommands implements CommandsInterface { 


    @Override

    public void setCellInfoListRate(int rateInMillis, Message result, WorkSource workSource) {

        workSource = getDeafultWorkSourceIfInvalid(workSource);

        workSource = getDefaultWorkSourceIfInvalid(workSource);

        IRadio radioProxy = getRadioProxy(result);

        if (radioProxy != null) {

            RILRequest rr = obtainRequest(RIL_REQUEST_SET_UNSOL_CELL_INFO_LIST_RATE, result,
@@ -4497,7 +4497,7 @@ public class RIL extends BaseCommands implements CommandsInterface { 


    @Override

    public void nvReadItem(int itemID, Message result, WorkSource workSource) {

        workSource = getDeafultWorkSourceIfInvalid(workSource);

        workSource = getDefaultWorkSourceIfInvalid(workSource);

        IRadio radioProxy = getRadioProxy(result);

        if (radioProxy != null) {

            RILRequest rr = obtainRequest(RIL_REQUEST_NV_READ_ITEM, result,
@@ -4518,7 +4518,7 @@ public class RIL extends BaseCommands implements CommandsInterface { 


    @Override

    public void nvWriteItem(int itemId, String itemValue, Message result, WorkSource workSource) {

        workSource = getDeafultWorkSourceIfInvalid(workSource);

        workSource = getDefaultWorkSourceIfInvalid(workSource);

        IRadio radioProxy = getRadioProxy(result);

        if (radioProxy != null) {

            RILRequest rr = obtainRequest(RIL_REQUEST_NV_WRITE_ITEM, result,
@@ -4954,7 +4954,7 @@ public class RIL extends BaseCommands implements CommandsInterface { 


    @Override

    public void getModemActivityInfo(Message result, WorkSource workSource) {

        workSource = getDeafultWorkSourceIfInvalid(workSource);

        workSource = getDefaultWorkSourceIfInvalid(workSource);

        IRadio radioProxy = getRadioProxy(result);

        if (radioProxy != null) {

            RILRequest rr = obtainRequest(RIL_REQUEST_GET_ACTIVITY_INFO, result,
@@ -5020,7 +5020,7 @@ public class RIL extends BaseCommands implements CommandsInterface { 
        riljLog("RIL.java - setAllowedCarriers");



        checkNotNull(carrierRestrictionRules, "Carrier restriction cannot be null.");

        workSource = getDeafultWorkSourceIfInvalid(workSource);

        workSource = getDefaultWorkSourceIfInvalid(workSource);



        IRadio radioProxy = getRadioProxy(result);

        if (radioProxy == null) return;
@@ -5100,7 +5100,7 @@ public class RIL extends BaseCommands implements CommandsInterface { 


    @Override

    public void getAllowedCarriers(Message result, WorkSource workSource) {

        workSource = getDeafultWorkSourceIfInvalid(workSource);

        workSource = getDefaultWorkSourceIfInvalid(workSource);



        IRadio radioProxy = getRadioProxy(result);

        if (radioProxy == null) return;
@@ -5340,7 +5340,7 @@ public class RIL extends BaseCommands implements CommandsInterface { 


    @Override

    public void setSimCardPower(int state, Message result, WorkSource workSource) {

        workSource = getDeafultWorkSourceIfInvalid(workSource);

        workSource = getDefaultWorkSourceIfInvalid(workSource);

        IRadio radioProxy = getRadioProxy(result);

        if (radioProxy != null) {

            RILRequest rr = obtainRequest(RIL_REQUEST_SET_SIM_CARD_POWER, result,
@@ -5350,7 +5350,15 @@ public class RIL extends BaseCommands implements CommandsInterface { 
                riljLog(rr.serialString() + "> " + requestToString(rr.mRequest) + " " + state);

            }



            if (mRadioVersion.greaterOrEqual(RADIO_HAL_VERSION_1_1)) {

            if (mRadioVersion.greaterOrEqual(RADIO_HAL_VERSION_1_6)) {

                try {

                    android.hardware.radio.V1_6.IRadio radioProxy16 =

                            (android.hardware.radio.V1_6.IRadio) radioProxy;

                    radioProxy16.setSimCardPower_1_6(rr.mSerial, state);

                } catch (RemoteException | RuntimeException e) {

                    handleRadioProxyExceptionForRR(rr, "setSimCardPower", e);

                }

            } else if (mRadioVersion.greaterOrEqual(RADIO_HAL_VERSION_1_1)) {

                try {

                    android.hardware.radio.V1_1.IRadio radioProxy11 =

                            (android.hardware.radio.V1_1.IRadio) radioProxy;
@@ -6052,7 +6060,7 @@ public class RIL extends BaseCommands implements CommandsInterface { 
        rr.release();

    }



    private WorkSource getDeafultWorkSourceIfInvalid(WorkSource workSource) {

    private WorkSource getDefaultWorkSourceIfInvalid(WorkSource workSource) {

        if (workSource == null) {

            workSource = mRILDefaultWorkSource;

        }