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

Merge "Prevent LocalSocket from creating an fd if fd is already there" am: 616910fd53

Browse Source 
am: d76576b6d1

Change-Id: I0b59b10a095bf23d4f26856690bf6be2a5304cbc
This commit is contained in:
Ajay Panicker
2017-01-06 01:46:10 +00:00
committed by android-build-merger
parent 94924f38fb d76576b6d1
commit e0211af867
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
core/java/android/net/LocalSocket.java
View File

@@ -73,6 +73,7 @@ public class LocalSocket implements Closeable {
this(new LocalSocketImpl(fd), SOCKET_UNKNOWN); this(new LocalSocketImpl(fd), SOCKET_UNKNOWN);
isBound = true; isBound = true;
isConnected = true; isConnected = true;
implCreated = true;
} }
private LocalSocket(LocalSocketImpl impl, int sockType) { private LocalSocket(LocalSocketImpl impl, int sockType) {
@@ -223,11 +224,11 @@ public class LocalSocket implements Closeable {
implCreateIfNeeded(); implCreateIfNeeded();
impl.shutdownOutput(); impl.shutdownOutput();
} }
public void setReceiveBufferSize(int size) throws IOException { public void setReceiveBufferSize(int size) throws IOException {
impl.setOption(SocketOptions.SO_RCVBUF, Integer.valueOf(size)); impl.setOption(SocketOptions.SO_RCVBUF, Integer.valueOf(size));
} }
public int getReceiveBufferSize() throws IOException { public int getReceiveBufferSize() throws IOException {
return ((Integer) impl.getOption(SocketOptions.SO_RCVBUF)).intValue(); return ((Integer) impl.getOption(SocketOptions.SO_RCVBUF)).intValue();
} }
@@ -235,7 +236,7 @@ public class LocalSocket implements Closeable {
public void setSoTimeout(int n) throws IOException { public void setSoTimeout(int n) throws IOException {
impl.setOption(SocketOptions.SO_TIMEOUT, Integer.valueOf(n)); impl.setOption(SocketOptions.SO_TIMEOUT, Integer.valueOf(n));
} }
public int getSoTimeout() throws IOException { public int getSoTimeout() throws IOException {
return ((Integer) impl.getOption(SocketOptions.SO_TIMEOUT)).intValue(); return ((Integer) impl.getOption(SocketOptions.SO_TIMEOUT)).intValue();
} }
@@ -243,7 +244,7 @@ public class LocalSocket implements Closeable {
public void setSendBufferSize(int n) throws IOException { public void setSendBufferSize(int n) throws IOException {
impl.setOption(SocketOptions.SO_SNDBUF, Integer.valueOf(n)); impl.setOption(SocketOptions.SO_SNDBUF, Integer.valueOf(n));
} }
public int getSendBufferSize() throws IOException { public int getSendBufferSize() throws IOException {
return ((Integer) impl.getOption(SocketOptions.SO_SNDBUF)).intValue(); return ((Integer) impl.getOption(SocketOptions.SO_SNDBUF)).intValue();
} }
@@ -328,5 +329,5 @@ public class LocalSocket implements Closeable {
*/ */
public FileDescriptor getFileDescriptor() { public FileDescriptor getFileDescriptor() {
return impl.getFileDescriptor(); return impl.getFileDescriptor();
} }
} }