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

Merge "Add wrappers around IO functions to check the return values" into tm-dev

Browse Source
This commit is contained in:
Roman Kiryanov
2022-05-11 02:39:03 +00:00
committed by Android (Google) Code Review
parent bfbf74aec1 1555d1d210
commit bce1d372f9
1 changed files with 35 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
services/core/java/com/android/server/clipboard/EmulatorClipboardMonitor.java
View File

@@ -25,6 +25,7 @@ import android.system.OsConstants;
import android.system.VmSocketAddress; import android.system.VmSocketAddress;
import android.util.Slog; import android.util.Slog;
import java.io.EOFException;
import java.io.FileDescriptor; import java.io.FileDescriptor;
import java.io.InterruptedIOException; import java.io.InterruptedIOException;
import java.net.SocketException; import java.net.SocketException;
@@ -93,16 +94,16 @@ class EmulatorClipboardMonitor implements Consumer<ClipData> {
} }
} }
private byte[] receiveMessage() throws ErrnoException, InterruptedIOException { private byte[] receiveMessage() throws ErrnoException, InterruptedIOException, EOFException {
final byte[] lengthBits = new byte[4]; final byte[] lengthBits = new byte[4];
Os.read(mPipe, lengthBits, 0, lengthBits.length); readFully(mPipe, lengthBits, 0, lengthBits.length);
final ByteBuffer bb = ByteBuffer.wrap(lengthBits); final ByteBuffer bb = ByteBuffer.wrap(lengthBits);
bb.order(ByteOrder.LITTLE_ENDIAN); bb.order(ByteOrder.LITTLE_ENDIAN);
final int msgLen = bb.getInt(); final int msgLen = bb.getInt();
final byte[] msg = new byte[msgLen]; final byte[] msg = new byte[msgLen];
Os.read(mPipe, msg, 0, msg.length); readFully(mPipe, msg, 0, msg.length);
return msg; return msg;
} }
@@ -115,8 +116,8 @@ class EmulatorClipboardMonitor implements Consumer<ClipData> {
bb.order(ByteOrder.LITTLE_ENDIAN); bb.order(ByteOrder.LITTLE_ENDIAN);
bb.putInt(msg.length); bb.putInt(msg.length);
Os.write(fd, lengthBits, 0, lengthBits.length); writeFully(fd, lengthBits, 0, lengthBits.length);
Os.write(fd, msg, 0, msg.length); writeFully(fd, msg, 0, msg.length);
} }
EmulatorClipboardMonitor(final Consumer<ClipData> setAndroidClipboard) { EmulatorClipboardMonitor(final Consumer<ClipData> setAndroidClipboard) {
@@ -141,7 +142,7 @@ class EmulatorClipboardMonitor implements Consumer<ClipData> {
Slog.i(TAG, "Setting the guest clipboard to '" + str + "'"); Slog.i(TAG, "Setting the guest clipboard to '" + str + "'");
} }
setAndroidClipboard.accept(clip); setAndroidClipboard.accept(clip);
} catch (ErrnoException | InterruptedIOException e) { } catch (ErrnoException | EOFException | InterruptedIOException e) {
closePipe(); closePipe();
} catch (InterruptedException | IllegalArgumentException e) { } catch (InterruptedException | IllegalArgumentException e) {
} }
@@ -182,4 +183,32 @@ class EmulatorClipboardMonitor implements Consumer<ClipData> {
t.start(); t.start();
} }
} }
private static void readFully(final FileDescriptor fd,
final byte[] buf, int offset, int size)
throws ErrnoException, InterruptedIOException, EOFException {
while (size > 0) {
final int r = Os.read(fd, buf, offset, size);
if (r > 0) {
offset += r;
size -= r;
} else {
throw new EOFException();
}
}
}
private static void writeFully(final FileDescriptor fd,
final byte[] buf, int offset, int size)
throws ErrnoException, InterruptedIOException {
while (size > 0) {
final int r = Os.write(fd, buf, offset, size);
if (r > 0) {
offset += r;
size -= r;
} else {
throw new ErrnoException("write", OsConstants.EIO);
}
}
}
} }