diff options
| author | Tobias Thierer <tobiast@google.com> | 2017-11-08 16:34:03 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2017-11-08 16:34:03 +0000 |
| commit | e8b07e5bef4446c02468d80f7b8d80fe87d50dd8 (patch) | |
| tree | 58fc1c36011c9b0bd00f1d9fa9be63dacb0a084f /core/java | |
| parent | 7805de4002883194cf57ca1e0abccf6ef88824b8 (diff) | |
| parent | 99a1d450da406e3377495b272b47a5d0d29a5a06 (diff) | |
Merge "Track deprecation/replacement of Os methods that depend on Mutable*"
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/net/LocalSocketImpl.java | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/core/java/android/net/LocalSocketImpl.java b/core/java/android/net/LocalSocketImpl.java index 05c8afb358b0..6e4a231bcd55 100644 --- a/core/java/android/net/LocalSocketImpl.java +++ b/core/java/android/net/LocalSocketImpl.java @@ -16,18 +16,18 @@ package android.net; -import java.io.IOException; -import java.io.OutputStream; -import java.io.InputStream; -import java.io.FileDescriptor; -import java.net.SocketOptions; - import android.system.ErrnoException; +import android.system.Int32Ref; import android.system.Os; import android.system.OsConstants; import android.system.StructLinger; import android.system.StructTimeval; -import android.util.MutableInt; + +import java.io.FileDescriptor; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; +import java.net.SocketOptions; /** * Socket implementation used for android.net.LocalSocket and @@ -62,7 +62,7 @@ class LocalSocketImpl FileDescriptor myFd = fd; if (myFd == null) throw new IOException("socket closed"); - MutableInt avail = new MutableInt(0); + Int32Ref avail = new Int32Ref(0); try { Os.ioctlInt(myFd, OsConstants.FIONREAD, avail); } catch (ErrnoException e) { @@ -167,7 +167,7 @@ class LocalSocketImpl if (myFd == null) throw new IOException("socket closed"); // Loop until the output buffer is empty. - MutableInt pending = new MutableInt(0); + Int32Ref pending = new Int32Ref(0); while (true) { try { // See linux/net/unix/af_unix.c |