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

Commit 331edc9a authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Make NattKeepalivePacketData @SystemApi" am: 3516f585 am: 7522764e am: b256f4d3 

Change-Id: Idd26f3118e879ab05a8cdd23a9e4999b3bafbf47
parents 84a2321e b256f4d3

api/system-current.txt

+7 −0
Original line number Diff line number Diff line
@@ -4952,6 +4952,13 @@ package android.net { 
    field @NonNull public static final android.os.Parcelable.Creator<android.net.MatchAllNetworkSpecifier> CREATOR;

  }













  public final class NattKeepalivePacketData extends android.net.KeepalivePacketData implements android.os.Parcelable {













    ctor public NattKeepalivePacketData(@NonNull java.net.InetAddress, int, @NonNull java.net.InetAddress, int, @NonNull byte[]) throws android.net.InvalidPacketException;













    method public int describeContents();













    method public void writeToParcel(@NonNull android.os.Parcel, int);













    field @NonNull public static final android.os.Parcelable.Creator<android.net.NattKeepalivePacketData> CREATOR;













  }



























  public class Network implements android.os.Parcelable {















    ctor public Network(@NonNull android.net.Network);















    method @NonNull public android.net.Network getPrivateDnsBypassingCopy();

































core/java/android/net/NattKeepalivePacketData.java



+10
−6




























Original line number
Diff line number
Diff line








@@ -16,9 +16,11 @@





























package android.net;





























import static android.net.SocketKeepalive.ERROR_INVALID_IP_ADDRESS;













import static android.net.SocketKeepalive.ERROR_INVALID_PORT;













import static android.net.InvalidPacketException.ERROR_INVALID_IP_ADDRESS;













import static android.net.InvalidPacketException.ERROR_INVALID_PORT;





























import android.annotation.NonNull;













import android.annotation.SystemApi;















import android.net.util.IpUtils;















import android.os.Parcel;















import android.os.Parcelable;









@@ -30,20 +32,22 @@ import java.nio.ByteBuffer;













import java.nio.ByteOrder;































/** @hide */













@SystemApi















public final class NattKeepalivePacketData extends KeepalivePacketData implements Parcelable {















    private static final int IPV4_HEADER_LENGTH = 20;















    private static final int UDP_HEADER_LENGTH = 8;































    // This should only be constructed via static factory methods, such as















    // nattKeepalivePacket













    private NattKeepalivePacketData(InetAddress srcAddress, int srcPort,













            InetAddress dstAddress, int dstPort, byte[] data) throws













    public NattKeepalivePacketData(@NonNull InetAddress srcAddress, int srcPort,













            @NonNull InetAddress dstAddress, int dstPort, @NonNull byte[] data) throws















            InvalidPacketException {















        super(srcAddress, srcPort, dstAddress, dstPort, data);















    }































    /**















     * Factory method to create Nat-T keepalive packet structure.













     * @hide















     */















    public static NattKeepalivePacketData nattKeepalivePacket(















            InetAddress srcAddress, int srcPort, InetAddress dstAddress, int dstPort)










@@ -87,7 +91,7 @@ public final class NattKeepalivePacketData extends KeepalivePacketData implement













    }































    /** Write to parcel */













    public void writeToParcel(Parcel out, int flags) {













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















        out.writeString(srcAddress.getHostAddress());















        out.writeString(dstAddress.getHostAddress());















        out.writeInt(srcPort);









@@ -95,7 +99,7 @@ public final class NattKeepalivePacketData extends KeepalivePacketData implement













    }































    /** Parcelable Creator */













    public static final Parcelable.Creator<NattKeepalivePacketData> CREATOR =













    public static final @NonNull Parcelable.Creator<NattKeepalivePacketData> CREATOR =















            new Parcelable.Creator<NattKeepalivePacketData>() {















                public NattKeepalivePacketData createFromParcel(Parcel in) {















                    final InetAddress srcAddress =