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

Commit 80b8c7f1 authored by Sarah Chin's avatar Sarah Chin
Browse files

Update constructors for IRadioData classes 

Test: atest FrameworksTelephonyTests
Bug: 198331673
Change-Id: I8480df1164548dde491c6ae6251bbc2725c3eadf
Merged-In: I8480df1164548dde491c6ae6251bbc2725c3eadf
parent 8dafa60a

Android.bp

+6 −0
Original line number Original line Diff line number Diff line
@@ -244,6 +244,12 @@ java_library { 
        "android.hardware.radio-V1.4-java",

        "android.hardware.radio-V1.4-java",

        "android.hardware.radio-V1.5-java",

        "android.hardware.radio-V1.5-java",

        "android.hardware.radio-V1.6-java",

        "android.hardware.radio-V1.6-java",

        "android.hardware.radio.data-V1-java",

        "android.hardware.radio.messaging-V1-java",

        "android.hardware.radio.modem-V1-java",

        "android.hardware.radio.network-V1-java",

        "android.hardware.radio.sim-V1-java",

        "android.hardware.radio.voice-V1-java",

        "android.hardware.thermal-V1.0-java-constants",

        "android.hardware.thermal-V1.0-java-constants",

        "android.hardware.thermal-V1.0-java",

        "android.hardware.thermal-V1.0-java",

        "android.hardware.thermal-V1.1-java",

        "android.hardware.thermal-V1.1-java",

telephony/java/android/telephony/data/EpsQos.java

+3 −9
Original line number Original line Diff line number Diff line
@@ -32,15 +32,9 @@ public final class EpsQos extends Qos implements Parcelable { 




    int qosClassId;

    int qosClassId;





    public EpsQos() {

    public EpsQos(QosBandwidth downlink, QosBandwidth uplink, int qosClassId) {

        super(Qos.QOS_TYPE_EPS,

        super(Qos.QOS_TYPE_EPS, downlink, uplink);

                new android.hardware.radio.V1_6.QosBandwidth(),

        this.qosClassId = qosClassId;

                new android.hardware.radio.V1_6.QosBandwidth());

    }



    public EpsQos(@NonNull android.hardware.radio.V1_6.EpsQos qos) {

        super(Qos.QOS_TYPE_EPS, qos.downlink, qos.uplink);

        qosClassId = qos.qci;

    }

    }





    private EpsQos(Parcel source) {

    private EpsQos(Parcel source) {

telephony/java/android/telephony/data/NetworkSlicingConfig.java

+6 −30
Original line number Original line Diff line number Diff line
@@ -33,39 +33,15 @@ public final class NetworkSlicingConfig implements Parcelable { 
    private final List<NetworkSliceInfo> mSliceInfo;

    private final List<NetworkSliceInfo> mSliceInfo;





    public NetworkSlicingConfig() {

    public NetworkSlicingConfig() {

        mUrspRules = new ArrayList<UrspRule>();

        mUrspRules = new ArrayList<>();

        mSliceInfo = new ArrayList<NetworkSliceInfo>();

        mSliceInfo = new ArrayList<>();

    }

    }





    /** @hide */

    /** @hide */

    public NetworkSlicingConfig(android.hardware.radio.V1_6.SlicingConfig sc) {

    public NetworkSlicingConfig(List<UrspRule> urspRules, List<NetworkSliceInfo> sliceInfo) {

        this(sc.urspRules, sc.sliceInfo);

        this();

    }

        mUrspRules.addAll(urspRules);



        mSliceInfo.addAll(sliceInfo);

    /** @hide */

    public NetworkSlicingConfig(List<android.hardware.radio.V1_6.UrspRule> urspRules,

            List<android.hardware.radio.V1_6.SliceInfo> sliceInfo) {

        mUrspRules = new ArrayList<UrspRule>();

        for (android.hardware.radio.V1_6.UrspRule ur : urspRules) {

            mUrspRules.add(new UrspRule(ur.precedence, ur.trafficDescriptors,

                    ur.routeSelectionDescriptor));

        }

        mSliceInfo = new ArrayList<NetworkSliceInfo>();

        for (android.hardware.radio.V1_6.SliceInfo si : sliceInfo) {

            mSliceInfo.add(sliceInfoBuilder(si));

        }

    }



    private NetworkSliceInfo sliceInfoBuilder(android.hardware.radio.V1_6.SliceInfo si) {

        NetworkSliceInfo.Builder builder = new NetworkSliceInfo.Builder()

                .setSliceServiceType(si.sst)

                .setMappedHplmnSliceServiceType(si.mappedHplmnSst);

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

            builder

                .setSliceDifferentiator(si.sliceDifferentiator)

                .setMappedHplmnSliceDifferentiator(si.mappedHplmnSD);

        }

        return builder.build();

    }

    }





    /** @hide */

    /** @hide */

telephony/java/android/telephony/data/NrQos.java

+6 −5
Original line number Original line Diff line number Diff line
@@ -32,11 +32,12 @@ public final class NrQos extends Qos implements Parcelable { 
    int fiveQi;

    int fiveQi;

    int averagingWindowMs;

    int averagingWindowMs;





    public NrQos(@NonNull android.hardware.radio.V1_6.NrQos qos) {

    public NrQos(QosBandwidth downlink, QosBandwidth uplink, int qosFlowId, int fiveQi,

        super(Qos.QOS_TYPE_NR, qos.downlink, qos.uplink);

            int averagingWindowMs) {

        fiveQi = qos.fiveQi;

        super(Qos.QOS_TYPE_NR, downlink, uplink);

        qosFlowId = qos.qfi;

        this.qosFlowId = qosFlowId;

        averagingWindowMs = qos.averagingWindowMs;

        this.fiveQi = fiveQi;

        this.averagingWindowMs = averagingWindowMs;

    }

    }





    private NrQos(Parcel source) {

    private NrQos(Parcel source) {

telephony/java/android/telephony/data/Qos.java

+4 −21
Original line number Original line Diff line number Diff line
@@ -48,12 +48,10 @@ public abstract class Qos { 
    final QosBandwidth downlink;

    final QosBandwidth downlink;

    final QosBandwidth uplink;

    final QosBandwidth uplink;





    Qos(int type,

    Qos(int type, QosBandwidth downlink, QosBandwidth uplink) {

            @NonNull android.hardware.radio.V1_6.QosBandwidth downlink,

            @NonNull android.hardware.radio.V1_6.QosBandwidth uplink) {

        this.type = type;

        this.type = type;

        this.downlink = new QosBandwidth(downlink.maxBitrateKbps, downlink.guaranteedBitrateKbps);

        this.downlink = downlink;

        this.uplink = new QosBandwidth(uplink.maxBitrateKbps, uplink.guaranteedBitrateKbps);

        this.uplink = uplink;

    }

    }





    public QosBandwidth getDownlinkBandwidth() {

    public QosBandwidth getDownlinkBandwidth() {
@@ -68,10 +66,7 @@ public abstract class Qos { 
        int maxBitrateKbps;

        int maxBitrateKbps;

        int guaranteedBitrateKbps;

        int guaranteedBitrateKbps;





        QosBandwidth() {

        public QosBandwidth(int maxBitrateKbps, int guaranteedBitrateKbps) {

        }



        QosBandwidth(int maxBitrateKbps, int guaranteedBitrateKbps) {

            this.maxBitrateKbps = maxBitrateKbps;

            this.maxBitrateKbps = maxBitrateKbps;

            this.guaranteedBitrateKbps = guaranteedBitrateKbps;

            this.guaranteedBitrateKbps = guaranteedBitrateKbps;

        }

        }
@@ -157,18 +152,6 @@ public abstract class Qos { 
        dest.writeParcelable(uplink, flags);

        dest.writeParcelable(uplink, flags);

    }

    }





    /** @hide */

    public static @NonNull Qos create(@NonNull android.hardware.radio.V1_6.Qos qos) {

        switch (qos.getDiscriminator()) {

            case android.hardware.radio.V1_6.Qos.hidl_discriminator.eps:

                  return new EpsQos(qos.eps());

            case android.hardware.radio.V1_6.Qos.hidl_discriminator.nr:

                  return new NrQos(qos.nr());

            default:

                  return null;

        }

    }



    /** @hide */

    /** @hide */

    public @QosType int getType() {

    public @QosType int getType() {

        return type;

        return type;