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

Commit 8a334f43 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

Change-Id: Iab8db7985b5cdd52b22aa2b72e3273c2d8f2f892
parents cf545aa0 9881c6f3

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

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

    }

    }