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

Commit 29d5f990 authored by Sarah Chin's avatar Sarah Chin Committed by Automerger Merge Worker
Browse files

Merge "Fix request for getSystemSelectionChannels" am: 27614a5c 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2142f5f91d97882be6c036f3b858d5011016ceb1
parents bb12b915 27614a5c

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

+1 −1
Original line number Diff line number Diff line
@@ -1244,7 +1244,7 @@ public class RIL extends BaseCommands implements CommandsInterface { 
            return;

        }



        RILRequest rr = obtainRequest(RIL_REQUEST_SET_SYSTEM_SELECTION_CHANNELS, onComplete,

        RILRequest rr = obtainRequest(RIL_REQUEST_GET_SYSTEM_SELECTION_CHANNELS, onComplete,

                mRILDefaultWorkSource);



        android.hardware.radio.V1_6.IRadio radioProxy16 =

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

+3 −1
Original line number Diff line number Diff line
@@ -3000,9 +3000,11 @@ public class RadioResponse extends IRadioResponse.Stub { 


    /**

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

     * @param specifiers List of RadioAccessSpecifiers that are scanned.

     */

    public void getSystemSelectionChannelsResponse(

            android.hardware.radio.V1_6.RadioResponseInfo info) {

            android.hardware.radio.V1_6.RadioResponseInfo info,

            ArrayList<android.hardware.radio.V1_5.RadioAccessSpecifier> specifiers) {

        responseVoid_1_6(info);

    }