commit 2d24f7a39e6e6335adee7cc5bd0f363533beef79
author Neil Fuller <nfuller@google.com> Thu Jun 20 14:09:15 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Jun 20 14:09:15 2019 +0000
tree c323b2af6ae2b1307dd09be845785527ecb95d37
parent 09f6675744839dfd59b218832cdb4dc3fe435d75
parent 6ae89f2f9c908696369440b1bf0f7e42cb5b9e0b

Merge "Switch to a single PacketSocketAddress constructor"

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

diff --git a/core/java/android/net/util/SocketUtils.java b/core/java/android/net/util/SocketUtils.java
index 1364d8c..d9bcb3c 100644
--- a/core/java/android/net/util/SocketUtils.java
+++ b/core/java/android/net/util/SocketUtils.java
@@ -69,7 +69,10 @@
      */
     @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 @@
      */
     @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 */);
     }
 
     /**