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

Merge "Add API to set the sll_protocol on PacketSocket"

Browse Source 
am: 0d6c308c39

Change-Id: I203f26229dcd580704665f7a07a391facef49a17
This commit is contained in:
Remi NGUYEN VAN
2019-10-31 21:50:40 -07:00
committed by android-build-merger
parent 0e50b2c926 0d6c308c39
commit 7919e04f5b
3 changed files with 18 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
api/system-current.txt
View File

@@ -4432,7 +4432,8 @@ package android.net.util {
method public static void closeSocket(@Nullable java.io.FileDescriptor) throws java.io.IOException;
method @NonNull public static java.net.SocketAddress makeNetlinkSocketAddress(int, int);
method @NonNull public static java.net.SocketAddress makePacketSocketAddress(int, int);
method @NonNull public static java.net.SocketAddress makePacketSocketAddress(int, @NonNull byte[]);
method @Deprecated @NonNull public static java.net.SocketAddress makePacketSocketAddress(int, @NonNull byte[]);
method @NonNull public static java.net.SocketAddress makePacketSocketAddress(int, int, @NonNull byte[]);
}
}

3
api/test-current.txt
View File

@@ -1654,7 +1654,8 @@ package android.net.util {
method public static void closeSocket(@Nullable java.io.FileDescriptor) throws java.io.IOException;
method @NonNull public static java.net.SocketAddress makeNetlinkSocketAddress(int, int);
method @NonNull public static java.net.SocketAddress makePacketSocketAddress(int, int);
method @NonNull public static java.net.SocketAddress makePacketSocketAddress(int, @NonNull byte[]);
method @Deprecated @NonNull public static java.net.SocketAddress makePacketSocketAddress(int, @NonNull byte[]);
method @NonNull public static java.net.SocketAddress makePacketSocketAddress(int, int, @NonNull byte[]);
}
}

14
core/java/android/net/util/SocketUtils.java
View File

@@ -77,7 +77,9 @@ public final class SocketUtils {
/**
* Make a socket address that packet socket can send packets to.
* @deprecated Use {@link #makePacketSocketAddress(int, int, byte[])} instead.
*/
@Deprecated
@NonNull
public static SocketAddress makePacketSocketAddress(int ifIndex, @NonNull byte[] hwAddr) {
return new PacketSocketAddress(
@@ -86,6 +88,18 @@ public final class SocketUtils {
hwAddr /* sll_addr */);
}
/**
* Make a socket address that packet socket can send packets to.
*/
@NonNull
public static SocketAddress makePacketSocketAddress(int protocol, int ifIndex,
@NonNull byte[] hwAddr) {
return new PacketSocketAddress(
protocol /* sll_protocol */,
ifIndex /* sll_ifindex */,
hwAddr /* sll_addr */);
}
/**
* @see IoBridge#closeAndSignalBlockedThreads(FileDescriptor)
*/