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 am: 9881c6f3d7

Browse Source 
am: 8a334f433b

Change-Id: Id914c2bd60e6fec47f346684a9c1d8046b5b9b7b
This commit is contained in:
Neil Fuller
2019-06-27 09:30:21 -07:00
committed by android-build-merger
parent d1d1e36e67 8a334f433b
commit 0c4d852cf4
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
public static SocketAddress makePacketSocketAddress(int protocol, int ifIndex) {
return new PacketSocketAddress(
(short) protocol /* sll_protocol */,
protocol /* sll_protocol */,
ifIndex /* sll_ifindex */,
null /* sll_addr */);
}
@@ -81,7 +81,7 @@ public final class SocketUtils {
@NonNull
public static SocketAddress makePacketSocketAddress(int ifIndex, @NonNull byte[] hwAddr) {
return new PacketSocketAddress(
(short) 0 /* sll_protocol */,
0 /* sll_protocol */,
ifIndex /* sll_ifindex */,
hwAddr /* sll_addr */);
}