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

Commit 9be7c26f authored by Amit Mahajan's avatar Amit Mahajan
Browse files

Client (framework) side HAL changes for RIL solicited responses - 2 

Test: Basic telephony sanity
Bug: 32020264
Change-Id: Ib2e70b94b401b8ab3e8968134e4dd20ec29ab989
parent d8fe3ba2

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

+1 −6
Original line number Diff line number Diff line
@@ -1935,12 +1935,7 @@ public class GsmCdmaPhone extends Phone { 
    private void handleRadioAvailable() {

        mCi.getBasebandVersion(obtainMessage(EVENT_GET_BASEBAND_VERSION_DONE));



        if (isPhoneTypeGsm()) {

            mCi.getIMEI(obtainMessage(EVENT_GET_IMEI_DONE));

            mCi.getIMEISV(obtainMessage(EVENT_GET_IMEISV_DONE));

        } else {

        mCi.getDeviceIdentity(obtainMessage(EVENT_GET_DEVICE_IDENTITY_DONE));

        }

        mCi.getRadioCapability(obtainMessage(EVENT_GET_RADIO_CAPABILITY));

        startLceAfterRadioIsAvailable();

    }

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

+19 −31
Original line number Diff line number Diff line
@@ -3070,12 +3070,19 @@ public final class RIL extends BaseCommands implements CommandsInterface { 


    @Override

    public void reportStkServiceIsRunning(Message result) {

        RILRequest rr = RILRequest.obtain(RIL_REQUEST_REPORT_STK_SERVICE_IS_RUNNING, result,

        IRadio radioProxy = getRadioProxy(result);

        if (radioProxy != null) {

            RILRequest rr = obtainRequest(RIL_REQUEST_REPORT_STK_SERVICE_IS_RUNNING, result,

                    mRILDefaultWorkSource);



            if (RILJ_LOGD) riljLog(rr.serialString() + "> " + requestToString(rr.mRequest));



        send(rr);

            try {

                radioProxy.reportStkServiceIsRunning(rr.mSerial);

            } catch (RemoteException | RuntimeException e) {

                handleRadioProxyExceptionForRR(rr, "reportStkServiceIsRunning", e);

            }

        }

    }



    @Override
@@ -3891,20 +3898,12 @@ public final class RIL extends BaseCommands implements CommandsInterface { 


    @Override

    public void getIMEI(Message result) {

        RILRequest rr = RILRequest.obtain(RIL_REQUEST_GET_IMEI, result, mRILDefaultWorkSource);



        if (RILJ_LOGD) riljLog(rr.serialString() + "> " + requestToString(rr.mRequest));



        send(rr);

        throw new RuntimeException("getIMEI not expected to be called");

    }



    @Override

    public void getIMEISV(Message result) {

        RILRequest rr = RILRequest.obtain(RIL_REQUEST_GET_IMEISV, result, mRILDefaultWorkSource);



        if (RILJ_LOGD) riljLog(rr.serialString() + "> " + requestToString(rr.mRequest));



        send(rr);

        throw new RuntimeException("getIMEISV not expected to be called");

    }



    /**
@@ -3913,7 +3912,7 @@ public final class RIL extends BaseCommands implements CommandsInterface { 
    @Deprecated

    @Override

    public void getLastPdpFailCause(Message result) {

        getLastDataCallFailCause(result);

        throw new RuntimeException("getLastPdpFailCause not expected to be called");

    }



    /**
@@ -3921,12 +3920,7 @@ public final class RIL extends BaseCommands implements CommandsInterface { 
     */

    @Override

    public void getLastDataCallFailCause(Message result) {

        RILRequest rr = RILRequest.obtain(RIL_REQUEST_LAST_DATA_CALL_FAIL_CAUSE, result,

                mRILDefaultWorkSource);



        if (RILJ_LOGD) riljLog(rr.serialString() + "> " + requestToString(rr.mRequest));



        send(rr);

        throw new RuntimeException("getLastDataCallFailCause not expected to be called");

    }



    /**
@@ -3951,11 +3945,7 @@ public final class RIL extends BaseCommands implements CommandsInterface { 


    @Override

    public void resetRadio(Message result) {

        RILRequest rr = RILRequest.obtain(RIL_REQUEST_RESET_RADIO, result, mRILDefaultWorkSource);



        if (RILJ_LOGD) riljLog(rr.serialString() + "> " + requestToString(rr.mRequest));



        send(rr);

        throw new RuntimeException("resetRadio not expected to be called");

    }



    /**
@@ -4476,12 +4466,7 @@ public final class RIL extends BaseCommands implements CommandsInterface { 
                    // separate CL. Other RIL commands below are deprecated and require framework

                    // code to be modified to remove them completely.

                    case RIL_REQUEST_SETUP_DATA_CALL: ret =  responseSetupDataCall(p); break;

                    case RIL_REQUEST_GET_IMEI: ret =  responseString(p); break;

                    case RIL_REQUEST_GET_IMEISV: ret =  responseString(p); break;

                    case RIL_REQUEST_LAST_DATA_CALL_FAIL_CAUSE: ret =  responseInts(p); break;

                    case RIL_REQUEST_RESET_RADIO: ret =  responseVoid(p); break;

                    case RIL_REQUEST_OEM_HOOK_RAW: ret =  responseRaw(p); break;

                    case RIL_REQUEST_REPORT_STK_SERVICE_IS_RUNNING: ret = responseVoid(p); break;

                    case RIL_REQUEST_SET_INITIAL_ATTACH_APN: ret = responseVoid(p); break;

                    case RIL_REQUEST_SET_DATA_PROFILE: ret = responseVoid(p); break;

                    default:
@@ -5719,6 +5704,9 @@ public final class RIL extends BaseCommands implements CommandsInterface { 
                    p.writeInt(cellInfoWcdma.signalStrengthWcdma.bitErrorRate);

                    break;

                }



                default:

                    throw new RuntimeException("unexpected cellinfotype: " + record.cellInfoType);

            }



            p.setDataPosition(0);

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

+7 −0
Original line number Diff line number Diff line
@@ -888,6 +888,13 @@ public class RadioResponse extends IRadioResponse.Stub { 
        responseVoid(responseInfo);

    }



    /**

     * @param responseInfo Response info struct containing response type, serial no. and error

     */

    public void reportStkServiceIsRunningResponse(RadioResponseInfo responseInfo) {

        responseVoid(responseInfo);

    }



    /**

     *

     * @param responseInfo Response info struct containing response type, serial no. and error

src/java/com/android/internal/telephony/dataconnection/DataConnection.java

+0 −7
Original line number Diff line number Diff line
@@ -709,8 +709,6 @@ public class DataConnection extends StateMachine { 
                    == CommandException.Error.RADIO_NOT_AVAILABLE) {

                result = DataCallResponse.SetupResult.ERR_BadCommand;

                result.mFailCause = DcFailCause.RADIO_NOT_AVAILABLE;

            } else if ((response == null) || (response.version < 4)) {

                result = DataCallResponse.SetupResult.ERR_GetLastErrorFromRil;

            } else {

                result = DataCallResponse.SetupResult.ERR_RilError;

                result.mFailCause = DcFailCause.fromInt(response.status);
@@ -1458,11 +1456,6 @@ public class DataConnection extends StateMachine { 
                            tearDownData(cp);

                            transitionTo(mDisconnectingErrorCreatingConnection);

                            break;

                        case ERR_GetLastErrorFromRil:

                            // Request failed and this is an old RIL

                            mPhone.mCi.getLastDataCallFailCause(

                                    obtainMessage(EVENT_GET_LAST_FAIL_DONE, cp));

                            break;

                        case ERR_RilError:



                            // Retrieve the suggested retry delay from the modem and save it.