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

Merge "Remove SocketUtils#setSocketTimeValueOption"

Browse Source
This commit is contained in:
Remi NGUYEN VAN
2019-04-05 07:13:54 +00:00
committed by Gerrit Code Review
parent fd7bbebeaa fecb63075b
commit 7fdf4e958d
4 changed files with 3 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
api/system-current.txt
View File

@@ -3499,7 +3499,6 @@ package android.net.util {
method @NonNull public static java.net.SocketAddress makeNetlinkSocketAddress(int, int); method @NonNull public static java.net.SocketAddress makeNetlinkSocketAddress(int, int);
method @NonNull public static java.net.SocketAddress makePacketSocketAddress(int, int); method @NonNull public static java.net.SocketAddress makePacketSocketAddress(int, int);
method @NonNull 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;
} }
} }

1
api/test-current.txt
View File

@@ -918,7 +918,6 @@ package android.net.util {
method @NonNull public static java.net.SocketAddress makeNetlinkSocketAddress(int, int); method @NonNull public static java.net.SocketAddress makeNetlinkSocketAddress(int, int);
method @NonNull public static java.net.SocketAddress makePacketSocketAddress(int, int); method @NonNull public static java.net.SocketAddress makePacketSocketAddress(int, int);
method @NonNull 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;
} }
} }

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

@@ -28,7 +28,6 @@ import android.system.ErrnoException;
import android.system.NetlinkSocketAddress; import android.system.NetlinkSocketAddress;
import android.system.Os; import android.system.Os;
import android.system.PacketSocketAddress; import android.system.PacketSocketAddress;
import android.system.StructTimeval;
import libcore.io.IoBridge; import libcore.io.IoBridge;
@@ -81,14 +80,6 @@ public final class SocketUtils {
return new PacketSocketAddress(ifIndex, hwAddr); return new PacketSocketAddress(ifIndex, hwAddr);
} }
/**
* Set an option on a socket that takes a time value argument.
*/
public static void setSocketTimeValueOption(
@NonNull FileDescriptor fd, int level, int option, long millis) throws ErrnoException {
Os.setsockoptTimeval(fd, level, option, StructTimeval.fromMillis(millis));
}
/** /**
* @see IoBridge#closeAndSignalBlockedThreads(FileDescriptor) * @see IoBridge#closeAndSignalBlockedThreads(FileDescriptor)
*/ */

5
services/net/java/android/net/netlink/NetlinkSocket.java
View File

@@ -30,6 +30,7 @@ import static android.system.OsConstants.SO_SNDTIMEO;
import android.net.util.SocketUtils; import android.net.util.SocketUtils;
import android.system.ErrnoException; import android.system.ErrnoException;
import android.system.Os; import android.system.Os;
import android.system.StructTimeval;
import android.util.Log; import android.util.Log;
import java.io.FileDescriptor; import java.io.FileDescriptor;
@@ -128,7 +129,7 @@ public class NetlinkSocket {
throws ErrnoException, IllegalArgumentException, InterruptedIOException { throws ErrnoException, IllegalArgumentException, InterruptedIOException {
checkTimeout(timeoutMs); checkTimeout(timeoutMs);
SocketUtils.setSocketTimeValueOption(fd, SOL_SOCKET, SO_RCVTIMEO, timeoutMs); Os.setsockoptTimeval(fd, SOL_SOCKET, SO_RCVTIMEO, StructTimeval.fromMillis(timeoutMs));
ByteBuffer byteBuffer = ByteBuffer.allocate(bufsize); ByteBuffer byteBuffer = ByteBuffer.allocate(bufsize);
int length = Os.read(fd, byteBuffer); int length = Os.read(fd, byteBuffer);
@@ -151,7 +152,7 @@ public class NetlinkSocket {
FileDescriptor fd, byte[] bytes, int offset, int count, long timeoutMs) FileDescriptor fd, byte[] bytes, int offset, int count, long timeoutMs)
throws ErrnoException, IllegalArgumentException, InterruptedIOException { throws ErrnoException, IllegalArgumentException, InterruptedIOException {
checkTimeout(timeoutMs); checkTimeout(timeoutMs);
SocketUtils.setSocketTimeValueOption(fd, SOL_SOCKET, SO_SNDTIMEO, timeoutMs); Os.setsockoptTimeval(fd, SOL_SOCKET, SO_SNDTIMEO, StructTimeval.fromMillis(timeoutMs));
return Os.write(fd, bytes, offset, count); return Os.write(fd, bytes, offset, count);
} }
} }