LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge changes from topic "natt-aidl+aidl-freeze" into qt-dev

Browse Source 
* changes:
  Add AIDL parcelable for NattKeepalivePacketData
  Move NattKeepalivePacketData out of the framework
This commit is contained in:
TreeHugger Robot
2019-04-29 16:26:23 +00:00
committed by Android (Google) Code Review
parent 511a7bf235 311bac9b68
commit 65caa406e7
1 changed files with 17 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
core/java/android/net/NattKeepalivePacketData.java → services/net/java/android/net/NattKeepalivePacketData.java
View File

@@ -19,8 +19,10 @@ package android.net;
import static android.net.SocketKeepalive.ERROR_INVALID_IP_ADDRESS;
import static android.net.SocketKeepalive.ERROR_INVALID_PORT;
import android.annotation.NonNull;
import android.net.SocketKeepalive.InvalidPacketException;
import android.net.util.IpUtils;
import android.os.Parcelable;
import android.system.OsConstants;
import java.net.Inet4Address;
@@ -29,8 +31,7 @@ import java.nio.ByteBuffer;
import java.nio.ByteOrder;
/** @hide */
public final class NattKeepalivePacketData extends KeepalivePacketData {
public final class NattKeepalivePacketData extends KeepalivePacketData implements Parcelable {
// This should only be constructed via static factory methods, such as
// nattKeepalivePacket
private NattKeepalivePacketData(InetAddress srcAddress, int srcPort,
@@ -77,4 +78,18 @@ public final class NattKeepalivePacketData extends KeepalivePacketData {
return new NattKeepalivePacketData(srcAddress, srcPort, dstAddress, dstPort, buf.array());
}
/**
* Convert this NattKeepalivePacketData to a NattKeepalivePacketDataParcelable.
*/
@NonNull
public NattKeepalivePacketDataParcelable toStableParcelable() {
final NattKeepalivePacketDataParcelable parcel = new NattKeepalivePacketDataParcelable();
parcel.srcAddress = srcAddress.getAddress();
parcel.srcPort = srcPort;
parcel.dstAddress = dstAddress.getAddress();
parcel.dstPort = dstPort;
return parcel;
}
}