From 6ae89f2f9c908696369440b1bf0f7e42cb5b9e0b Mon Sep 17 00:00:00 2001 From: Neil Fuller Date: Thu, 20 Jun 2019 09:02:56 +0100 Subject: [PATCH] Switch to a single PacketSocketAddress constructor Switch to a single PacketSocketAddress constructor to avoid multiple unnecessary overloads in the Core Platform API. Bug: 133196453 Bug: 124232146 Test: build only Change-Id: I30533ac3aa99c2cd09e8c624fedf6000b0f52c11 --- core/java/android/net/util/SocketUtils.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/core/java/android/net/util/SocketUtils.java b/core/java/android/net/util/SocketUtils.java index 1364d8c17e1b3..d9bcb3ce0d8f6 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 */); } /**