Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Switch to a single PacketSocketAddress constructor" am: 2d24f7a39e

Browse Source 
am: a357696c2f

Change-Id: I7db11188d9dd42e25b0aebd79acc92a9ba2f56a0
This commit is contained in:
Neil Fuller
2019-06-20 14:06:50 -07:00
committed by android-build-merger
parent 15199a5868 a357696c2f
commit 9ec43cc7fe
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/java/android/net/util/SocketUtils.java
View File

@@ -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 */);
}
/**