summaryrefslogtreecommitdiff
path: root/core/java
diff options
context:
space:
mode:
authorChiachang Wang <chiachangwang@google.com>2020-03-13 16:37:04 +0800
committerChiachang Wang <chiachangwang@google.com>2020-03-18 05:44:26 +0000
commitd4d035d6ebc047811cec4899a9feeaf76c005c02 (patch)
tree796cc2e38d7958e1ecde8b1f9dd6df2c3b86d0a7 /core/java
parent3c5ecde097b72094af217b2ec5c280e7a6fdbfcc (diff)
Add NattKeepalivePacketDataTest
Add test for constructor and parcel Test: atest CtsNetTestCasesLatestSdk:android.net.NattKeepalivePacketDataTest on both Q and R devices Bug: 151402211 Change-Id: I97015365604be1846e3ecbaf60ac99e334705565 Merged-In: I97015365604be1846e3ecbaf60ac99e334705565
Diffstat (limited to 'core/java')
-rw-r--r--core/java/android/net/NattKeepalivePacketData.java17
1 files changed, 17 insertions, 0 deletions
diff --git a/core/java/android/net/NattKeepalivePacketData.java b/core/java/android/net/NattKeepalivePacketData.java
index bd39c13ba092..29da4952daa5 100644
--- a/core/java/android/net/NattKeepalivePacketData.java
+++ b/core/java/android/net/NattKeepalivePacketData.java
@@ -20,6 +20,7 @@ import static android.net.InvalidPacketException.ERROR_INVALID_IP_ADDRESS;
import static android.net.InvalidPacketException.ERROR_INVALID_PORT;
import android.annotation.NonNull;
+import android.annotation.Nullable;
import android.annotation.SystemApi;
import android.net.util.IpUtils;
import android.os.Parcel;
@@ -30,6 +31,7 @@ import java.net.Inet4Address;
import java.net.InetAddress;
import java.nio.ByteBuffer;
import java.nio.ByteOrder;
+import java.util.Objects;
/** @hide */
@SystemApi
@@ -121,4 +123,19 @@ public final class NattKeepalivePacketData extends KeepalivePacketData implement
return new NattKeepalivePacketData[size];
}
};
+
+ @Override
+ public boolean equals(@Nullable final Object o) {
+ if (!(o instanceof NattKeepalivePacketData)) return false;
+ final NattKeepalivePacketData other = (NattKeepalivePacketData) o;
+ return this.srcAddress.equals(other.srcAddress)
+ && this.dstAddress.equals(other.dstAddress)
+ && this.srcPort == other.srcPort
+ && this.dstPort == other.dstPort;
+ }
+
+ @Override
+ public int hashCode() {
+ return Objects.hash(srcAddress, dstAddress, srcPort, dstPort);
+ }
}