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

Commit 52fa4629 authored by Remi NGUYEN VAN's avatar Remi NGUYEN VAN
Browse files

Revert "Update framework for 5G Slicing" 

Revert submission 13372384-5g_slicing_master

Reason for revert: Broken build: b/178985315
Reverted Changes:
Ie2af7642d:Update ril_service in cuttlefish for 5G Slicing
Ia81414769:Update framework for 5G Slicing
I18d25a104:Update HAL 1.6 for 5G Slicing

Change-Id: Ic671c93e2ed7cd4484074290aba7897379e12929
parent d030f7cb

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

+1 −7
Original line number Diff line number Diff line
@@ -57,7 +57,6 @@ 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;
@@ -2015,10 +2014,6 @@ 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="
@@ -2029,8 +2024,7 @@ public class RIL extends BaseCommands implements CommandsInterface { 
                    }



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

                            reason, addresses15, dnses, pduSessionId, sliceInfo16,

                            trafficDescriptor16, matchAllRuleAllowed);

                            reason, addresses15, dnses, pduSessionId, sliceInfo16);

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

                    // IRadio V1.5

                    android.hardware.radio.V1_5.IRadio radioProxy15 =