diff options
| author | Tobias Thierer <tobiast@google.com> | 2017-11-08 16:52:46 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-11-08 16:52:46 +0000 |
| commit | fbaf4253aee55251af59f3638f18a19a806d8c7c (patch) | |
| tree | d1b05e2e6ea180b7a1438e634b23ea51f384f59a /core/java | |
| parent | e288472122a790157d26a8cda2ac8c3487ddd7c6 (diff) | |
| parent | d20ae24fb1f1068d6cd5eac49ad4f66422f66aef (diff) | |
Merge "Track deprecation/replacement of Os methods that depend on Mutable*" am: e8b07e5bef
am: d20ae24fb1
Change-Id: I275c4fb658f6c158d38a6062bf1622e239e1603c
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 |