diff options
| author | Aaron Huang <huangaaron@google.com> | 2019-10-02 01:39:46 +0800 |
|---|---|---|
| committer | Aaron Huang <huangaaron@google.com> | 2019-12-17 16:21:19 +0000 |
| commit | 08d9ade8e21845de693893ff7d6a57024bf74a9a (patch) | |
| tree | 2da3325a01658b7d6e212f453d29af4bd835bcfd /services/net | |
| parent | 82001cf9939451a66827873ef811af8ac49634fd (diff) | |
Add keepalive related methods and fields to system APIs
Add KeepalivePacketData to system API for mainline support.
Also, remove InvalidPacketException class from SocketKeepalive
and create a new InvalidPacketException class in android.net
Bug: 139268426
Bug: 135998869
Bug: 138306002
Test: atest FrameworksNetTests
atest NetworkStackTests
atest FrameworksTelephonyTests
./frameworks/opt/net/wifi/tests/wifitests/runtests.sh
atest android.net.cts
atest android.net.wifi.cts
atest android.telephony.cts
Change-Id: I2d982e8abb5cb6b4c74a20483550b18cf814320d
Merged-In: I2d982e8abb5cb6b4c74a20483550b18cf814320d
Diffstat (limited to 'services/net')
| -rw-r--r-- | services/net/java/android/net/TcpKeepalivePacketData.java | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/services/net/java/android/net/TcpKeepalivePacketData.java b/services/net/java/android/net/TcpKeepalivePacketData.java index 7f2f499ab21f..aad75ae16aa9 100644 --- a/services/net/java/android/net/TcpKeepalivePacketData.java +++ b/services/net/java/android/net/TcpKeepalivePacketData.java @@ -19,7 +19,6 @@ import static android.net.SocketKeepalive.ERROR_INVALID_IP_ADDRESS; import android.annotation.NonNull; import android.annotation.Nullable; -import android.net.SocketKeepalive.InvalidPacketException; import android.net.util.IpUtils; import android.os.Parcel; import android.os.Parcelable; |