Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix API for SocketUtils"

Browse Source 
am: 4a66729cfe

Change-Id: I2340b528ab7a1a628e257205603d0d902f7cccd0
This commit is contained in:
Remi NGUYEN VAN
2019-03-19 01:21:20 -07:00
committed by android-build-merger
parent 7d249575a1 4a66729cfe
commit 55d7bc0106
3 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
api/system-current.txt
View File

@@ -3525,16 +3525,16 @@ package android.net.metrics {
package android.net.util { package android.net.util {
public class SocketUtils { public final class SocketUtils {
method public static void addArpEntry(@NonNull java.net.Inet4Address, @NonNull android.net.MacAddress, @NonNull String, @NonNull java.io.FileDescriptor) throws java.io.IOException; method public static void addArpEntry(@NonNull java.net.Inet4Address, @NonNull android.net.MacAddress, @NonNull String, @NonNull java.io.FileDescriptor) throws java.io.IOException;
method public static void attachControlPacketFilter(@NonNull java.io.FileDescriptor, int) throws java.net.SocketException; method public static void attachControlPacketFilter(@NonNull java.io.FileDescriptor, int) throws java.net.SocketException;
method public static void attachDhcpFilter(@NonNull java.io.FileDescriptor) throws java.net.SocketException; method public static void attachDhcpFilter(@NonNull java.io.FileDescriptor) throws java.net.SocketException;
method public static void attachRaFilter(@NonNull java.io.FileDescriptor, int) throws java.net.SocketException; method public static void attachRaFilter(@NonNull java.io.FileDescriptor, int) throws java.net.SocketException;
method public static void bindSocketToInterface(@NonNull java.io.FileDescriptor, @NonNull String) throws android.system.ErrnoException; method public static void bindSocketToInterface(@NonNull java.io.FileDescriptor, @NonNull String) throws android.system.ErrnoException;
method public static void closeSocket(@Nullable java.io.FileDescriptor) throws java.io.IOException; method public static void closeSocket(@Nullable java.io.FileDescriptor) throws java.io.IOException;
method public static java.net.SocketAddress makeNetlinkSocketAddress(int, int); method @NonNull public static java.net.SocketAddress makeNetlinkSocketAddress(int, int);
method public static java.net.SocketAddress makePacketSocketAddress(short, int); method @NonNull public static java.net.SocketAddress makePacketSocketAddress(int, int);
method public static java.net.SocketAddress makePacketSocketAddress(int, @NonNull byte[]); method @NonNull public static java.net.SocketAddress makePacketSocketAddress(int, @NonNull byte[]);
method public static void setSocketTimeValueOption(@NonNull java.io.FileDescriptor, int, int, long) throws android.system.ErrnoException; method public static void setSocketTimeValueOption(@NonNull java.io.FileDescriptor, int, int, long) throws android.system.ErrnoException;
} }

8
api/test-current.txt
View File

@@ -935,16 +935,16 @@ package android.net.metrics {
package android.net.util { package android.net.util {
public class SocketUtils { public final class SocketUtils {
method public static void addArpEntry(@NonNull java.net.Inet4Address, @NonNull android.net.MacAddress, @NonNull String, @NonNull java.io.FileDescriptor) throws java.io.IOException; method public static void addArpEntry(@NonNull java.net.Inet4Address, @NonNull android.net.MacAddress, @NonNull String, @NonNull java.io.FileDescriptor) throws java.io.IOException;
method public static void attachControlPacketFilter(@NonNull java.io.FileDescriptor, int) throws java.net.SocketException; method public static void attachControlPacketFilter(@NonNull java.io.FileDescriptor, int) throws java.net.SocketException;
method public static void attachDhcpFilter(@NonNull java.io.FileDescriptor) throws java.net.SocketException; method public static void attachDhcpFilter(@NonNull java.io.FileDescriptor) throws java.net.SocketException;
method public static void attachRaFilter(@NonNull java.io.FileDescriptor, int) throws java.net.SocketException; method public static void attachRaFilter(@NonNull java.io.FileDescriptor, int) throws java.net.SocketException;
method public static void bindSocketToInterface(@NonNull java.io.FileDescriptor, @NonNull String) throws android.system.ErrnoException; method public static void bindSocketToInterface(@NonNull java.io.FileDescriptor, @NonNull String) throws android.system.ErrnoException;
method public static void closeSocket(@Nullable java.io.FileDescriptor) throws java.io.IOException; method public static void closeSocket(@Nullable java.io.FileDescriptor) throws java.io.IOException;
method public static java.net.SocketAddress makeNetlinkSocketAddress(int, int); method @NonNull public static java.net.SocketAddress makeNetlinkSocketAddress(int, int);
method public static java.net.SocketAddress makePacketSocketAddress(short, int); method @NonNull public static java.net.SocketAddress makePacketSocketAddress(int, int);
method public static java.net.SocketAddress makePacketSocketAddress(int, @NonNull byte[]); method @NonNull public static java.net.SocketAddress makePacketSocketAddress(int, @NonNull byte[]);
method public static void setSocketTimeValueOption(@NonNull java.io.FileDescriptor, int, int, long) throws android.system.ErrnoException; method public static void setSocketTimeValueOption(@NonNull java.io.FileDescriptor, int, int, long) throws android.system.ErrnoException;
} }

9
core/java/android/net/util/SocketUtils.java
View File

@@ -45,7 +45,7 @@ import java.net.SocketException;
*/ */
@SystemApi @SystemApi
@TestApi @TestApi
public class SocketUtils { public final class SocketUtils {
/** /**
* Create a raw datagram socket that is bound to an interface. * Create a raw datagram socket that is bound to an interface.
* *
@@ -63,6 +63,7 @@ public class SocketUtils {
/** /**
* Make a socket address to communicate with netlink. * Make a socket address to communicate with netlink.
*/ */
@NonNull
public static SocketAddress makeNetlinkSocketAddress(int portId, int groupsMask) { public static SocketAddress makeNetlinkSocketAddress(int portId, int groupsMask) {
return new NetlinkSocketAddress(portId, groupsMask); return new NetlinkSocketAddress(portId, groupsMask);
} }
@@ -70,13 +71,15 @@ public class SocketUtils {
/** /**
* Make socket address that packet sockets can bind to. * Make socket address that packet sockets can bind to.
*/ */
public static SocketAddress makePacketSocketAddress(short protocol, int ifIndex) { @NonNull
return new PacketSocketAddress(protocol, ifIndex); public static SocketAddress makePacketSocketAddress(int protocol, int ifIndex) {
return new PacketSocketAddress((short) protocol, ifIndex);
} }
/** /**
* Make a socket address that packet socket can send packets to. * Make a socket address that packet socket can send packets to.
*/ */
@NonNull
public static SocketAddress makePacketSocketAddress(int ifIndex, @NonNull byte[] hwAddr) { public static SocketAddress makePacketSocketAddress(int ifIndex, @NonNull byte[] hwAddr) {
return new PacketSocketAddress(ifIndex, hwAddr); return new PacketSocketAddress(ifIndex, hwAddr);
} }