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

Commit 796e0bf7 authored by Sarah Chin's avatar Sarah Chin
Browse files

Add response and indications for IRadio 1.5 

setNetworkSelectionModeManualResponse_1_5
startNetworkScanResponse_1_5
setupDataCallResponse_1_5
getDataCallListResponse_1_5
setInitialAttachApnResponse_1_5
setLinkCapacityReportingCriteriaResponse_1_5
setDataProfileResponse_1_5
dataCallListChanged_1_5

Test: atest RILTest
Bug: 151774189
Change-Id: I20e61b81425f5762a9b536b8a3ba83b180c2633b
Merged-In: I20e61b81425f5762a9b536b8a3ba83b180c2633b
parent dc11c8e6

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

+17 −12
Original line number Diff line number Diff line
@@ -334,25 +334,20 @@ public class RadioIndication extends IRadioIndication.Stub { 
    /** Indicates current data call list. */

    public void dataCallListChanged(int indicationType,

            ArrayList<android.hardware.radio.V1_0.SetupDataCallResult> dcList) {

        mRil.processIndication(indicationType);



        if (RIL.RILJ_LOGD) mRil.unsljLogRet(RIL_UNSOL_DATA_CALL_LIST_CHANGED, dcList);



        ArrayList<DataCallResponse> response = RIL.convertDataCallResultList(dcList);

        mRil.mDataCallListChangedRegistrants.notifyRegistrants(

                new AsyncResult(null, response, null));

        responseDataCallListChanged(indicationType, dcList);

    }



    /** Indicates current data call list with radio HAL 1.4. */

    public void dataCallListChanged_1_4(int indicationType,

            ArrayList<android.hardware.radio.V1_4.SetupDataCallResult> dcList) {

        mRil.processIndication(indicationType);

        responseDataCallListChanged(indicationType, dcList);



        if (RIL.RILJ_LOGD) mRil.unsljLogRet(RIL_UNSOL_DATA_CALL_LIST_CHANGED, dcList);

    }



        ArrayList<DataCallResponse> response = RIL.convertDataCallResultList(dcList);

        mRil.mDataCallListChangedRegistrants.notifyRegistrants(

                new AsyncResult(null, response, null));

    /** Indicates current data call list with radio HAL 1.5. */

    public void dataCallListChanged_1_5(int indicationType,

            ArrayList<android.hardware.radio.V1_5.SetupDataCallResult> dcList) {

        responseDataCallListChanged(indicationType, dcList);

    }



    public void suppSvcNotify(int indicationType, SuppSvcNotification suppSvcNotification) {
@@ -1124,4 +1119,14 @@ public class RadioIndication extends IRadioIndication.Stub { 
        if (RIL.RILJ_LOGD) mRil.unsljLogRet(RIL_UNSOL_NETWORK_SCAN_RESULT, nsr);

        mRil.mRilNetworkScanResultRegistrants.notifyRegistrants(new AsyncResult(null, nsr, null));

    }



    private void responseDataCallListChanged(int indicationType, List<?> dcList) {

        mRil.processIndication(indicationType);



        if (RIL.RILJ_LOGD) mRil.unsljLogRet(RIL_UNSOL_DATA_CALL_LIST_CHANGED, dcList);



        ArrayList<DataCallResponse> response = RIL.convertDataCallResultList(dcList);

        mRil.mDataCallListChangedRegistrants.notifyRegistrants(

                new AsyncResult(null, response, null));

    }

}

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

+57 −0
Original line number Diff line number Diff line
@@ -444,6 +444,16 @@ public class RadioResponse extends IRadioResponse.Stub { 
        responseSetupDataCall(responseInfo, setupDataCallResult);

    }



    /**

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

     * @param setupDataCallResult Response to data call setup as defined by setupDataCallResult in

     *                            1.5/types.hal

     */

    public void setupDataCallResponse_1_5(RadioResponseInfo responseInfo,

            android.hardware.radio.V1_5.SetupDataCallResult setupDataCallResult) {

        responseSetupDataCall(responseInfo, setupDataCallResult);

    }



    /**

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

     * @param iccIo ICC io operation response as defined by IccIoResult in types.hal
@@ -595,6 +605,13 @@ public class RadioResponse extends IRadioResponse.Stub { 
        responseVoid(responseInfo);

    }



    /**

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

     */

    public void setNetworkSelectionModeManualResponse_1_5(RadioResponseInfo responseInfo) {

        responseVoid(responseInfo);

    }



    /**

     *

     * @param responseInfo Response info struct containing response type, serial no. and error
@@ -625,6 +642,15 @@ public class RadioResponse extends IRadioResponse.Stub { 
        responseScanStatus(responseInfo);

    }



    /**

     * The same method as startNetworkScanResponse_1_5.

     *

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

     */

    public void startNetworkScanResponse_1_5(RadioResponseInfo responseInfo) {

        responseScanStatus(responseInfo);

    }



    /**

     *

     * @param responseInfo Response info struct containing response type, serial no. and error
@@ -708,6 +734,16 @@ public class RadioResponse extends IRadioResponse.Stub { 
        responseDataCallList(responseInfo, dataCallResultList);

    }



    /**

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

     * @param dataCallResultList Response to get data call list as defined by setupDataCallResult in

     *                           1.5/types.hal

     */

    public void getDataCallListResponse_1_5(RadioResponseInfo responseInfo,

            ArrayList<android.hardware.radio.V1_5.SetupDataCallResult> dataCallResultList) {

        responseDataCallList(responseInfo, dataCallResultList);

    }



    public void sendOemRilRequestRawResponse(RadioResponseInfo responseInfo,

                                             ArrayList<Byte> var2) {}
@@ -1146,6 +1182,13 @@ public class RadioResponse extends IRadioResponse.Stub { 
        responseVoid(responseInfo);

    }



    /**

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

     */

    public void setInitialAttachApnResponse_1_5(RadioResponseInfo responseInfo) {

        responseVoid(responseInfo);

    }



    /**

     *

     * @param responseInfo Response info struct containing response type, serial no. and error
@@ -1281,6 +1324,13 @@ public class RadioResponse extends IRadioResponse.Stub { 
        responseVoid(responseInfo);

    }



    /**

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

     */

    public void setDataProfileResponse_1_5(RadioResponseInfo responseInfo) {

        responseVoid(responseInfo);

    }



    /**

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

     */
@@ -1472,6 +1522,13 @@ public class RadioResponse extends IRadioResponse.Stub { 
        responseVoid(responseInfo);

    }



    /**

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

     */

    public void setLinkCapacityReportingCriteriaResponse_1_5(RadioResponseInfo responseInfo) {

        responseVoid(responseInfo);

    }



    /**

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

     */