Merge "Document the arguments to SocketUtils.makePacketSocketAddress." into... (727a1707) · Commits · e / os / android_frameworks_base

core/java/android/net/util/SocketUtils.java

+13 −1

Original line number	Original line	Diff line number	Diff line
	@@ -66,6 +66,10 @@ public final class SocketUtils {

	/**		/**
	* Make socket address that packet sockets can bind to.		* 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		@NonNull
	public static SocketAddress makePacketSocketAddress(int protocol, int ifIndex) {		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.		* Make a socket address that packet socket can send packets to.
	* @deprecated Use {@link #makePacketSocketAddress(int, int, byte[])} instead.		* @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		@Deprecated
	@NonNull		@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		@NonNull
	public static SocketAddress makePacketSocketAddress(int protocol, int ifIndex,		public static SocketAddress makePacketSocketAddress(int protocol, int ifIndex,