diff options
| author | Neil Fuller <nfuller@google.com> | 2019-06-20 14:19:53 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-06-20 14:19:53 -0700 |
| commit | dcf7d6e377959ea44bfb017c0b78b9ef51e5d7cd (patch) | |
| tree | cddc549cc8c7d8814de6181f8fb9829fec4c4257 /core/java | |
| parent | 7d84adaf449d323c6f6fd6fcb3c85e59926cff04 (diff) | |
| parent | 9ec43cc7fe1f3aea02ed2a97ce6a38617cce86ec (diff) | |
Merge "Switch to a single PacketSocketAddress constructor" am: 2d24f7a39e am: a357696c2f
am: 9ec43cc7fe
Change-Id: Id17253fbe7d22117dff5766ce5b50b4e446e5090
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/net/util/SocketUtils.java | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/core/java/android/net/util/SocketUtils.java b/core/java/android/net/util/SocketUtils.java index 1364d8c17e1b..d9bcb3ce0d8f 100644 --- a/core/java/android/net/util/SocketUtils.java +++ b/core/java/android/net/util/SocketUtils.java @@ -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 */); } /** |