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

Merge "Document the arguments to SocketUtils.makePacketSocketAddress." am: c2083f4503

Browse Source 
Change-Id: Ie3c4ed9fe207f350ef575ba560b375e534c7523b
This commit is contained in:
Lorenzo Colitti
2020-03-19 05:35:02 +00:00
committed by Automerger Merge Worker
parent 87820659ab c2083f4503
commit 67ad6633c0
1 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -66,6 +66,10 @@ public final class SocketUtils {
/**
* Make socket address that packet sockets can bind to.
*
* @param protocol the layer 2 protocol of the packets to receive. One of the {@code ETH_P_*}
* constants in {@link android.system.OsConstants}.
* @param ifIndex the interface index on which packets will be received.
*/
@NonNull
public static SocketAddress makePacketSocketAddress(int protocol, int ifIndex) {
@@ -78,6 +82,9 @@ public final class SocketUtils {
/**
* Make a socket address that packet socket can send packets to.
* @deprecated Use {@link #makePacketSocketAddress(int, int, byte[])} instead.
*
* @param ifIndex the interface index on which packets will be sent.
* @param hwAddr the hardware address to which packets will be sent.
*/
@Deprecated
@NonNull
@@ -89,7 +96,12 @@ public final class SocketUtils {
}
/**
* Make a socket address that packet socket can send packets to.
* Make a socket address that a packet socket can send packets to.
*
* @param protocol the layer 2 protocol of the packets to send. One of the {@code ETH_P_*}
* constants in {@link android.system.OsConstants}.
* @param ifIndex the interface index on which packets will be sent.
* @param hwAddr the hardware address to which packets will be sent.
*/
@NonNull
public static SocketAddress makePacketSocketAddress(int protocol, int ifIndex,