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

Commit eee0a6a2 authored by Sarah Chin's avatar Sarah Chin Committed by Gerrit Code Review
Browse files

Merge changes from topics "5g_slicing_hal_vts_on_aosp_1st_part",... 

Merge changes from topics "5g_slicing_hal_vts_on_aosp_1st_part", "5g_slicing_hal_vts_on_aosp_2nd_part"

* changes:
  Support getSlicingConfigResponse() for 5G Slicing Configuration
  Update framework for 5G Slicing
parents 155d626f 38a6dfea

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

+7 −1
Original line number Diff line number Diff line
@@ -57,6 +57,7 @@ import android.hardware.radio.V1_5.IndicationFilter; 
import android.hardware.radio.V1_5.PersoSubstate;

import android.hardware.radio.V1_5.RadioAccessNetworks;

import android.hardware.radio.V1_6.OptionalSliceInfo;

import android.hardware.radio.V1_6.OptionalTrafficDescriptor;

import android.hardware.radio.deprecated.V1_0.IOemHook;

import android.net.InetAddresses;

import android.net.KeepalivePacketData;
@@ -2031,6 +2032,10 @@ public class RIL extends BaseCommands implements CommandsInterface { 
                    ArrayList<android.hardware.radio.V1_5.LinkAddress> addresses15 =

                            convertToHalLinkProperties15(linkProperties);



                    OptionalTrafficDescriptor trafficDescriptor16 =

                            new OptionalTrafficDescriptor();

                    boolean matchAllRuleAllowed = true;



                    if (RILJ_LOGD) {

                        riljLog(rr.serialString() + "> " + requestToString(rr.mRequest)

                                + ",accessNetworkType="
@@ -2041,7 +2046,8 @@ public class RIL extends BaseCommands implements CommandsInterface { 
                    }



                    radioProxy16.setupDataCall_1_6(rr.mSerial, accessNetworkType, dpi, allowRoaming,

                            reason, addresses15, dnses, pduSessionId, sliceInfo16);

                            reason, addresses15, dnses, pduSessionId, sliceInfo16,

                            trafficDescriptor16, matchAllRuleAllowed);

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

                    // IRadio V1.5

                    android.hardware.radio.V1_5.IRadio radioProxy15 =

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

+16 −0
Original line number Diff line number Diff line
@@ -3065,4 +3065,20 @@ public class RadioResponse extends IRadioResponse.Stub { 
    public void cancelHandoverResponse(android.hardware.radio.V1_6.RadioResponseInfo info) {

        responseVoid_1_6(info);

    }



    /**

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

     * @param slicingConfig Current slicing configuration

     */

    public void getSlicingConfigResponse(android.hardware.radio.V1_6.RadioResponseInfo info,

            android.hardware.radio.V1_6.SlicingConfig slicingConfig) {

        RILRequest rr = mRil.processResponse_1_6(info);



        if (rr != null) {

            if (info.error == RadioError.NONE) {

                sendMessageResponse(rr.mResult, slicingConfig);

            }

            mRil.processResponseDone_1_6(rr, info, slicingConfig);

        }

    }

}