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

am: 9881c6f3d7

Change-Id: Iab8db7985b5cdd52b22aa2b72e3273c2d8f2f892

1 files changed, 2 insertions, 2 deletions

diff --git a/core/java/android/net/util/SocketUtils.java b/core/java/android/net/util/SocketUtils.java
index d9bcb3ce0d8f..489a2922f70e 100644
--- a/core/java/android/net/util/SocketUtils.java
+++ b/core/java/android/net/util/SocketUtils.java
@@ -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 */);
     }