Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fixed NPE when local or remote port range does not exist" into sc-v2-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2022-01-11 02:39:48 +00:00
committed by Android (Google) Code Review
parent 830bf8bd34 e7ca21aa12
commit c7d8866a9b
1 changed files with 18 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
telephony/java/android/telephony/data/QosBearerFilter.java
View File

@@ -18,6 +18,7 @@ package android.telephony.data;
import android.annotation.IntDef; import android.annotation.IntDef;
import android.annotation.NonNull; import android.annotation.NonNull;
import android.annotation.Nullable;
import android.net.InetAddresses; import android.net.InetAddresses;
import android.net.LinkAddress; import android.net.LinkAddress;
import android.os.Parcel; import android.os.Parcel;
@@ -38,11 +39,10 @@ import java.util.Objects;
* @hide * @hide
*/ */
public final class QosBearerFilter implements Parcelable { public final class QosBearerFilter implements Parcelable {
private @NonNull List<LinkAddress> localAddresses;
private List<LinkAddress> localAddresses; private @NonNull List<LinkAddress> remoteAddresses;
private List<LinkAddress> remoteAddresses; private @Nullable PortRange localPort;
private PortRange localPort; private @Nullable PortRange remotePort;
private PortRange remotePort;
/** @hide */ /** @hide */
@Retention(RetentionPolicy.SOURCE) @Retention(RetentionPolicy.SOURCE)
@@ -59,13 +59,12 @@ public final class QosBearerFilter implements Parcelable {
public static final int QOS_PROTOCOL_AH = android.hardware.radio.V1_6.QosProtocol.AH; 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; 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 * Hardcoded in place 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) * 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; public static final int QOS_MAX_PORT = 65535; // android.hardware.radio.V1_6.QosPortRange.MIN;
@QosProtocol private @QosProtocol int protocol;
private int protocol;
private int typeOfServiceMask; private int typeOfServiceMask;
@@ -88,8 +87,7 @@ public final class QosBearerFilter implements Parcelable {
public static final int QOS_FILTER_DIRECTION_BIDIRECTIONAL = public static final int QOS_FILTER_DIRECTION_BIDIRECTIONAL =
android.hardware.radio.V1_6.QosFilterDirection.BIDIRECTIONAL; android.hardware.radio.V1_6.QosFilterDirection.BIDIRECTIONAL;
@QosBearerFilterDirection private @QosBearerFilterDirection int filterDirection;
private int filterDirection;
/** /**
* Specified the order in which the filter needs to be matched. * Specified the order in which the filter needs to be matched.
@@ -106,9 +104,10 @@ public final class QosBearerFilter implements Parcelable {
filterDirection = QOS_FILTER_DIRECTION_BIDIRECTIONAL; filterDirection = QOS_FILTER_DIRECTION_BIDIRECTIONAL;
} }
public QosBearerFilter(List<LinkAddress> localAddresses, List<LinkAddress> remoteAddresses, public QosBearerFilter(@NonNull List<LinkAddress> localAddresses,
PortRange localPort, PortRange remotePort, int protocol, int tos, @NonNull List<LinkAddress> remoteAddresses, @Nullable PortRange localPort,
long flowLabel, long spi, int direction, int precedence) { @Nullable PortRange remotePort, @QosProtocol int protocol, int tos, long flowLabel,
long spi, @QosBearerFilterDirection int direction, int precedence) {
this.localAddresses = localAddresses; this.localAddresses = localAddresses;
this.remoteAddresses = remoteAddresses; this.remoteAddresses = remoteAddresses;
this.localPort = localPort; this.localPort = localPort;
@@ -121,19 +120,19 @@ public final class QosBearerFilter implements Parcelable {
this.precedence = precedence; this.precedence = precedence;
} }
public List<LinkAddress> getLocalAddresses() { public @NonNull List<LinkAddress> getLocalAddresses() {
return localAddresses; return localAddresses;
} }
public List<LinkAddress> getRemoteAddresses() { public @NonNull List<LinkAddress> getRemoteAddresses() {
return remoteAddresses; return remoteAddresses;
} }
public PortRange getLocalPortRange() { public @Nullable PortRange getLocalPortRange() {
return localPort; return localPort;
} }
public PortRange getRemotePortRange() { public @Nullable PortRange getRemotePortRange() {
return remotePort; return remotePort;
} }
@@ -327,8 +326,8 @@ public final class QosBearerFilter implements Parcelable {
&& localAddresses.containsAll(other.localAddresses) && localAddresses.containsAll(other.localAddresses)
&& remoteAddresses.size() == other.remoteAddresses.size() && remoteAddresses.size() == other.remoteAddresses.size()
&& remoteAddresses.containsAll(other.remoteAddresses) && remoteAddresses.containsAll(other.remoteAddresses)
&& localPort.equals(other.localPort) && Objects.equals(localPort, other.localPort)
&& remotePort.equals(other.remotePort) && Objects.equals(remotePort, other.remotePort)
&& protocol == other.protocol && protocol == other.protocol
&& typeOfServiceMask == other.typeOfServiceMask && typeOfServiceMask == other.typeOfServiceMask
&& flowLabel == other.flowLabel && flowLabel == other.flowLabel