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

Merge "Track change of type from short -> int" am: d854e6e0b4

Browse Source 
am: 9881c6f3d7

Change-Id: Iab8db7985b5cdd52b22aa2b72e3273c2d8f2f892
This commit is contained in:
Neil Fuller
2019-06-27 02:43:34 -07:00
committed by android-build-merger
parent cf545aa02a 9881c6f3d7
commit 8a334f433b
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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