Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0c4d852c authored by Neil Fuller's avatar Neil Fuller Committed by android-build-merger
Browse files

Merge "Track change of type from short -> int" am: d854e6e0 am: 9881c6f3 

am: 8a334f43

Change-Id: Id914c2bd60e6fec47f346684a9c1d8046b5b9b7b
parents d1d1e36e 8a334f43

core/java/android/net/util/SocketUtils.java

+2 −2
Original line number Diff line number Diff line
@@ -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 */);

    }