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

Commit 2e7dada9 authored by Hongbo Zeng's avatar Hongbo Zeng Committed by Automerger Merge Worker
Browse files

Update framework for 5G Slicing am: 389920f0 am: 739d79de 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8232bc1a0381569143c2038b4be74f07b9d3c454
parents e8d1a4df 739d79de

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 =