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"

Browse Source 
am: d854e6e0b4

Change-Id: Ia5f6c78811911cbf211cd8f716bd6a3c2a6d8a69
This commit is contained in:
Neil Fuller
2019-06-27 02:26:56 -07:00
committed by android-build-merger
parent 92292f556b d854e6e0b4
commit 9881c6f3d7
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 */);
}