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

Commit 58f73aa4 authored by Jayachandran Chinnakkannu's avatar Jayachandran Chinnakkannu Committed by Automerger Merge Worker
Browse files

Merge "QOS: Check for portRange validity before filter matching" into sc-dev... 

Merge "QOS: Check for portRange validity before filter matching" into sc-dev am: 98a11ef7 am: 862941ff

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15115572

Change-Id: I5c53759a70916ecfce780108e1435b30f936ce72
parents 3a196021 862941ff

telephony/java/android/telephony/data/QosBearerFilter.java

+12 −0
Original line number Diff line number Diff line
@@ -57,6 +57,12 @@ public final class QosBearerFilter implements Parcelable { 
    public static final int QOS_PROTOCOL_UDP = android.hardware.radio.V1_6.QosProtocol.UDP;

    public static final int QOS_PROTOCOL_ESP = android.hardware.radio.V1_6.QosProtocol.ESP;

    public static final int QOS_PROTOCOL_AH = android.hardware.radio.V1_6.QosProtocol.AH;

    public static final int QOS_MIN_PORT = android.hardware.radio.V1_6.QosPortRange.MIN;

    /**

     * Hardcoded inplace of android.hardware.radio.V1_6.QosPortRange.MAX as it

     * returns -1 due to uint16_t to int conversion in java. (TODO: Fix the HAL)

     */

    public static final int QOS_MAX_PORT = 65535; // android.hardware.radio.V1_6.QosPortRange.MIN;



    @QosProtocol

    private int protocol;
@@ -229,6 +235,12 @@ public final class QosBearerFilter implements Parcelable { 
            return end;

        }



        public boolean isValid() {

            return start >= QOS_MIN_PORT && start <= QOS_MAX_PORT

                    && end >= QOS_MIN_PORT && end <= QOS_MAX_PORT

                    && start <= end;

        }



        @Override

        public void writeToParcel(@NonNull Parcel dest, int flags) {

            dest.writeInt(start);