Display and control your Android device
Work around Os.write() not updating position
Romain Vimontb882322f7371
diff --git a/server/src/main/java/com/genymobile/scrcpy/IO.java b/server/src/main/java/com/genymobile/scrcpy/IO.javaindex bfd48be2..f1f05105 100644--- a/server/src/main/java/com/genymobile/scrcpy/IO.java+++ b/server/src/main/java/com/genymobile/scrcpy/IO.java@@ -14,9 +14,18 @@ public class IO {}public static void writeFully(FileDescriptor fd, ByteBuffer from) throws IOException {- while (from.hasRemaining()) {+ // ByteBuffer position is not updated as expected by Os.write() on old Android versions, so+ // count the remaining bytes manually.+ // See <https://github.com/Genymobile/scrcpy/issues/291>.+ int remaining = from.remaining();+ while (remaining > 0) {try {- Os.write(fd, from);+ int w = Os.write(fd, from);+ if (BuildConfig.DEBUG && w < 0) {+ // w should not be negative, since an exception is thrown on error+ throw new AssertionError("Os.write() returned a negative value (" + w + ")");+ }+ remaining -= w;} catch (ErrnoException e) {if (e.errno != OsConstants.EINTR) {throw new IOException(e);