Merge "Switch to a single PacketSocketAddress constructor" (2d24f7a3) · Commits · e / os / android_frameworks_base

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

+8 −2

Original line number	Diff line number	Diff line
		@@ -69,7 +69,10 @@ public final class SocketUtils {
		*/
		@NonNull
		public static SocketAddress makePacketSocketAddress(int protocol, int ifIndex) {
		return new PacketSocketAddress((short) protocol, ifIndex);
		return new PacketSocketAddress(
		(short) protocol /* sll_protocol */,
		ifIndex /* sll_ifindex */,
		null /* sll_addr */);
		}

		/**
		@@ -77,7 +80,10 @@ public final class SocketUtils {
		*/
		@NonNull
		public static SocketAddress makePacketSocketAddress(int ifIndex, @NonNull byte[] hwAddr) {
		return new PacketSocketAddress(ifIndex, hwAddr);
		return new PacketSocketAddress(
		(short) 0 /* sll_protocol */,
		ifIndex /* sll_ifindex */,
		hwAddr /* sll_addr */);
		}

		/**