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

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

Merge "Rename SliceInfo to NetworkSliceInfo."

parents 5713dce7 ffb51eda

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

+3 −3
Original line number Original line Diff line number Diff line
@@ -34,7 +34,7 @@ import android.telephony.SignalThresholdInfo; 
import android.telephony.TelephonyManager;

import android.telephony.TelephonyManager;

import android.telephony.data.DataCallResponse;

import android.telephony.data.DataCallResponse;

import android.telephony.data.DataProfile;

import android.telephony.data.DataProfile;

import android.telephony.data.SliceInfo;

import android.telephony.data.NetworkSliceInfo;

import android.telephony.data.TrafficDescriptor;

import android.telephony.data.TrafficDescriptor;

import android.telephony.emergency.EmergencyNumber;

import android.telephony.emergency.EmergencyNumber;
@@ -1875,8 +1875,8 @@ public interface CommandsInterface { 
     */

     */

    void setupDataCall(int accessNetworkType, DataProfile dataProfile, boolean isRoaming,

    void setupDataCall(int accessNetworkType, DataProfile dataProfile, boolean isRoaming,

            boolean allowRoaming, int reason, LinkProperties linkProperties, int pduSessionId,

            boolean allowRoaming, int reason, LinkProperties linkProperties, int pduSessionId,

            SliceInfo sliceInfo, TrafficDescriptor trafficDescriptor, boolean matchAllRuleAllowed,

            NetworkSliceInfo sliceInfo, TrafficDescriptor trafficDescriptor,

            Message result);

            boolean matchAllRuleAllowed, Message result);





    /**

    /**

     * Deactivate packet data connection

     * Deactivate packet data connection

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

+9 −9
Original line number Original line Diff line number Diff line
@@ -109,9 +109,9 @@ import android.telephony.data.DataCallResponse; 
import android.telephony.data.DataCallResponse.HandoverFailureMode;

import android.telephony.data.DataCallResponse.HandoverFailureMode;

import android.telephony.data.DataProfile;

import android.telephony.data.DataProfile;

import android.telephony.data.DataService;

import android.telephony.data.DataService;

import android.telephony.data.NetworkSliceInfo;

import android.telephony.data.Qos;

import android.telephony.data.Qos;

import android.telephony.data.QosBearerSession;

import android.telephony.data.QosBearerSession;

import android.telephony.data.SliceInfo;

import android.telephony.data.TrafficDescriptor;

import android.telephony.data.TrafficDescriptor;

import android.telephony.emergency.EmergencyNumber;

import android.telephony.emergency.EmergencyNumber;

import android.text.TextUtils;

import android.text.TextUtils;
@@ -1931,7 +1931,7 @@ public class RIL extends BaseCommands implements CommandsInterface { 
        return dpi;

        return dpi;

    }

    }





    private static OptionalSliceInfo convertToHalSliceInfo(@Nullable SliceInfo sliceInfo) {

    private static OptionalSliceInfo convertToHalSliceInfo(@Nullable NetworkSliceInfo sliceInfo) {

        OptionalSliceInfo optionalSliceInfo = new OptionalSliceInfo();

        OptionalSliceInfo optionalSliceInfo = new OptionalSliceInfo();

        if (sliceInfo == null) {

        if (sliceInfo == null) {

            return optionalSliceInfo;

            return optionalSliceInfo;
@@ -2052,8 +2052,8 @@ public class RIL extends BaseCommands implements CommandsInterface { 
    @Override

    @Override

    public void setupDataCall(int accessNetworkType, DataProfile dataProfile, boolean isRoaming,

    public void setupDataCall(int accessNetworkType, DataProfile dataProfile, boolean isRoaming,

            boolean allowRoaming, int reason, LinkProperties linkProperties, int pduSessionId,

            boolean allowRoaming, int reason, LinkProperties linkProperties, int pduSessionId,

            SliceInfo sliceInfo, TrafficDescriptor trafficDescriptor, boolean matchAllRuleAllowed,

            NetworkSliceInfo sliceInfo, TrafficDescriptor trafficDescriptor,

            Message result) {

            boolean matchAllRuleAllowed, Message result) {

        IRadio radioProxy = getRadioProxy(result);

        IRadio radioProxy = getRadioProxy(result);





        if (radioProxy != null) {

        if (radioProxy != null) {
@@ -7613,7 +7613,7 @@ public class RIL extends BaseCommands implements CommandsInterface { 




        List<LinkAddress> laList = new ArrayList<>();

        List<LinkAddress> laList = new ArrayList<>();

        List<QosBearerSession> qosSessions = new ArrayList<>();

        List<QosBearerSession> qosSessions = new ArrayList<>();

        SliceInfo sliceInfo = null;

        NetworkSliceInfo sliceInfo = null;

        List<TrafficDescriptor> trafficDescriptors = new ArrayList<>();

        List<TrafficDescriptor> trafficDescriptors = new ArrayList<>();





        if (dcResult instanceof android.hardware.radio.V1_0.SetupDataCallResult) {

        if (dcResult instanceof android.hardware.radio.V1_0.SetupDataCallResult) {
@@ -7780,17 +7780,17 @@ public class RIL extends BaseCommands implements CommandsInterface { 
                .build();

                .build();

    }

    }





    private static SliceInfo convertToSliceInfo(OptionalSliceInfo optionalSliceInfo) {

    private static NetworkSliceInfo convertToSliceInfo(OptionalSliceInfo optionalSliceInfo) {

        if (optionalSliceInfo.getDiscriminator() == OptionalSliceInfo.hidl_discriminator.noinit) {

        if (optionalSliceInfo.getDiscriminator() == OptionalSliceInfo.hidl_discriminator.noinit) {

            return null;

            return null;

        }

        }





        android.hardware.radio.V1_6.SliceInfo si = optionalSliceInfo.value();

        android.hardware.radio.V1_6.SliceInfo si = optionalSliceInfo.value();

        SliceInfo.Builder builder =

        NetworkSliceInfo.Builder builder =

                new SliceInfo.Builder()

                new NetworkSliceInfo.Builder()

                .setSliceServiceType(si.sst)

                .setSliceServiceType(si.sst)

                .setMappedHplmnSliceServiceType(si.mappedHplmnSst);

                .setMappedHplmnSliceServiceType(si.mappedHplmnSst);

        if (si.sliceDifferentiator != SliceInfo.SLICE_DIFFERENTIATOR_NO_SLICE) {

        if (si.sliceDifferentiator != NetworkSliceInfo.SLICE_DIFFERENTIATOR_NO_SLICE) {

            builder

            builder

                .setSliceDifferentiator(si.sliceDifferentiator)

                .setSliceDifferentiator(si.sliceDifferentiator)

                .setMappedHplmnSliceDifferentiator(si.mappedHplmnSD);

                .setMappedHplmnSliceDifferentiator(si.mappedHplmnSD);

src/java/com/android/internal/telephony/dataconnection/CellularDataService.java

+2 −2
Original line number Original line Diff line number Diff line
@@ -29,7 +29,7 @@ import android.telephony.data.DataCallResponse; 
import android.telephony.data.DataProfile;

import android.telephony.data.DataProfile;

import android.telephony.data.DataService;

import android.telephony.data.DataService;

import android.telephony.data.DataServiceCallback;

import android.telephony.data.DataServiceCallback;

import android.telephony.data.SliceInfo;

import android.telephony.data.NetworkSliceInfo;

import android.telephony.data.TrafficDescriptor;

import android.telephony.data.TrafficDescriptor;





import com.android.internal.telephony.CommandException;

import com.android.internal.telephony.CommandException;
@@ -160,7 +160,7 @@ public class CellularDataService extends DataService { 
        @Override

        @Override

        public void setupDataCall(int accessNetworkType, DataProfile dataProfile,

        public void setupDataCall(int accessNetworkType, DataProfile dataProfile,

                boolean isRoaming, boolean allowRoaming, int reason, LinkProperties linkProperties,

                boolean isRoaming, boolean allowRoaming, int reason, LinkProperties linkProperties,

                int pduSessionId, SliceInfo sliceInfo, TrafficDescriptor trafficDescriptor,

                int pduSessionId, NetworkSliceInfo sliceInfo, TrafficDescriptor trafficDescriptor,

                boolean matchAllRuleAllowed, DataServiceCallback callback) {

                boolean matchAllRuleAllowed, DataServiceCallback callback) {

            if (DBG) log("setupDataCall " + getSlotIndex());

            if (DBG) log("setupDataCall " + getSlotIndex());

src/java/com/android/internal/telephony/dataconnection/DataConnection.java

+3 −3
Original line number Original line Diff line number Diff line
@@ -69,9 +69,9 @@ import android.telephony.data.DataCallResponse.HandoverFailureMode; 
import android.telephony.data.DataProfile;

import android.telephony.data.DataProfile;

import android.telephony.data.DataService;

import android.telephony.data.DataService;

import android.telephony.data.DataServiceCallback;

import android.telephony.data.DataServiceCallback;

import android.telephony.data.NetworkSliceInfo;

import android.telephony.data.Qos;

import android.telephony.data.Qos;

import android.telephony.data.QosBearerSession;

import android.telephony.data.QosBearerSession;

import android.telephony.data.SliceInfo;

import android.telephony.data.TrafficDescriptor;

import android.telephony.data.TrafficDescriptor;

import android.text.TextUtils;

import android.text.TextUtils;

import android.util.LocalLog;

import android.util.LocalLog;
@@ -320,7 +320,7 @@ public class DataConnection extends StateMachine { 
    private int mUplinkBandwidth = 14;

    private int mUplinkBandwidth = 14;

    private Qos mDefaultQos = null;

    private Qos mDefaultQos = null;

    private List<QosBearerSession> mQosBearerSessions = new ArrayList<>();

    private List<QosBearerSession> mQosBearerSessions = new ArrayList<>();

    private SliceInfo mSliceInfo;

    private NetworkSliceInfo mSliceInfo;

    private List<TrafficDescriptor> mTrafficDescriptors = new ArrayList<>();

    private List<TrafficDescriptor> mTrafficDescriptors = new ArrayList<>();





    /** The corresponding network agent for this data connection. */

    /** The corresponding network agent for this data connection. */
@@ -630,7 +630,7 @@ public class DataConnection extends StateMachine { 
        return mPduSessionId;

        return mPduSessionId;

    }

    }





    public SliceInfo getSliceInfo() {

    public NetworkSliceInfo getSliceInfo() {

        return mSliceInfo;

        return mSliceInfo;

    }

    }

src/java/com/android/internal/telephony/dataconnection/DataServiceManager.java

+2 −2
Original line number Original line Diff line number Diff line
@@ -51,7 +51,7 @@ import android.telephony.data.DataService; 
import android.telephony.data.DataServiceCallback;

import android.telephony.data.DataServiceCallback;

import android.telephony.data.IDataService;

import android.telephony.data.IDataService;

import android.telephony.data.IDataServiceCallback;

import android.telephony.data.IDataServiceCallback;

import android.telephony.data.SliceInfo;

import android.telephony.data.NetworkSliceInfo;

import android.telephony.data.TrafficDescriptor;

import android.telephony.data.TrafficDescriptor;

import android.text.TextUtils;

import android.text.TextUtils;
@@ -634,7 +634,7 @@ public class DataServiceManager extends Handler { 
     */

     */

    public void setupDataCall(int accessNetworkType, DataProfile dataProfile, boolean isRoaming,

    public void setupDataCall(int accessNetworkType, DataProfile dataProfile, boolean isRoaming,

            boolean allowRoaming, int reason, LinkProperties linkProperties, int pduSessionId,

            boolean allowRoaming, int reason, LinkProperties linkProperties, int pduSessionId,

            @Nullable  SliceInfo sliceInfo, @Nullable TrafficDescriptor trafficDescriptor,

            @Nullable NetworkSliceInfo sliceInfo, @Nullable TrafficDescriptor trafficDescriptor,

            boolean matchAllRuleAllowed, Message onCompleteMessage) {

            boolean matchAllRuleAllowed, Message onCompleteMessage) {

        if (DBG) log("setupDataCall");

        if (DBG) log("setupDataCall");

        if (!mBound) {

        if (!mBound) {