RepoMirrors/scrcpy
1
0
Fork 0
mirror of https://github.com/Genymobile/scrcpy synced 2024-12-13 18:56:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Work around Os.write() not updating position

Browse Source 
ByteBuffer position is not updated as expected by Os.write() on old
Android versions. Count the remaining bytes manually.

Fixes <https://github.com/Genymobile/scrcpy/issues/291>.
This commit is contained in:
Romain Vimont 2018-10-08 18:49:48 +02:00
parent 8875955921
commit b882322f73
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
server/src/main/java/com/genymobile/scrcpy/IO.java
View File

@ -14,9 +14,18 @@ public class IO {
} }
public static void writeFully(FileDescriptor fd, ByteBuffer from) throws IOException { 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 { 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) { } catch (ErrnoException e) {
if (e.errno != OsConstants.EINTR) { if (e.errno != OsConstants.EINTR) {
throw new IOException(e); throw new IOException(e);