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

Merge "Always close file descriptors" into pi-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2018-07-10 00:28:57 +00:00
committed by Android (Google) Code Review
parent a2b1e5f013 3c0dc27a4d
commit 8fe381f0fd
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -59,10 +59,9 @@ public class NetlinkSocket {
final String errPrefix = "Error in NetlinkSocket.sendOneShotKernelMessage"; final String errPrefix = "Error in NetlinkSocket.sendOneShotKernelMessage";
final long IO_TIMEOUT = 300L; final long IO_TIMEOUT = 300L;
FileDescriptor fd; final FileDescriptor fd = forProto(nlProto);
try { try {
fd = forProto(nlProto);
connectToKernel(fd); connectToKernel(fd);
sendMessage(fd, msg, 0, msg.length, IO_TIMEOUT); sendMessage(fd, msg, 0, msg.length, IO_TIMEOUT);
final ByteBuffer bytes = recvMessage(fd, DEFAULT_RECV_BUFSIZE, IO_TIMEOUT); final ByteBuffer bytes = recvMessage(fd, DEFAULT_RECV_BUFSIZE, IO_TIMEOUT);
@@ -96,9 +95,9 @@ public class NetlinkSocket {
} catch (SocketException e) { } catch (SocketException e) {
Log.e(TAG, errPrefix, e); Log.e(TAG, errPrefix, e);
throw new ErrnoException(errPrefix, EIO, e); throw new ErrnoException(errPrefix, EIO, e);
} finally {
IoUtils.closeQuietly(fd);
} }
IoUtils.closeQuietly(fd);
} }
public static FileDescriptor forProto(int nlProto) throws ErrnoException { public static FileDescriptor forProto(int nlProto) throws ErrnoException {