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

Merge changes from topics "presubmit-am-80b91e5f6c3340c785b1772da3a86806", "presubmit-am-8e48e4d2f9da4d69bc62fe6a4b39ef56", "presubmit-am-c978438eb5db452d8793cafc3024df96", "presubmit-am-d09990e2eb2246b1ac4d9766ce468226" into sc-v2-dev

Browse Source 
* changes:
  Cleanup in EmulatorClipboardMonitor (1)
  Add wrappers around IO functions to check the return values
  Set host's clipboard in a separate thread
  Log emulator's clipboard access to logcat
This commit is contained in:
TreeHugger Robot
2022-05-13 05:35:34 +00:00
committed by Android (Google) Code Review
parent 17389c0e03 3c23790a7d
commit fd5ed2cfd6
1 changed files with 62 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -18,12 +18,14 @@ package com.android.server.clipboard;
import android.annotation.Nullable;
import android.content.ClipData;
import android.os.SystemProperties;
import android.system.ErrnoException;
import android.system.Os;
import android.system.OsConstants;
import android.system.VmSocketAddress;
import android.util.Slog;
import java.io.EOFException;
import java.io.FileDescriptor;
import java.io.InterruptedIOException;
import java.net.SocketException;
@@ -39,6 +41,8 @@ class EmulatorClipboardMonitor implements Consumer<ClipData> {
private static final String PIPE_NAME = "pipe:clipboard";
private static final int HOST_PORT = 5000;
private final Thread mHostMonitorThread;
private static final boolean LOG_CLIBOARD_ACCESS =
SystemProperties.getBoolean("ro.boot.qemu.log_clipboard_access", false);
private FileDescriptor mPipe = null;
private static byte[] createOpenHandshake() {
@@ -51,8 +55,8 @@ class EmulatorClipboardMonitor implements Consumer<ClipData> {
return bits;
}
private boolean isPipeOpened() {
return mPipe != null;
private synchronized FileDescriptor getPipeFD() {
return mPipe;
}
private synchronized boolean openPipe() {
@@ -67,7 +71,7 @@ class EmulatorClipboardMonitor implements Consumer<ClipData> {
Os.connect(fd, new VmSocketAddress(HOST_PORT, OsConstants.VMADDR_CID_HOST));
final byte[] handshake = createOpenHandshake();
Os.write(fd, handshake, 0, handshake.length);
writeFully(fd, handshake, 0, handshake.length);
mPipe = fd;
return true;
} catch (ErrnoException | SocketException | InterruptedIOException e) {
@@ -90,28 +94,30 @@ class EmulatorClipboardMonitor implements Consumer<ClipData> {
}
}
private byte[] receiveMessage() throws ErrnoException, InterruptedIOException {
private byte[] receiveMessage() throws ErrnoException, InterruptedIOException, EOFException {
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);
bb.order(ByteOrder.LITTLE_ENDIAN);
final int msgLen = bb.getInt();
final byte[] msg = new byte[msgLen];
Os.read(mPipe, msg, 0, msg.length);
readFully(mPipe, msg, 0, msg.length);
return msg;
}
private void sendMessage(final byte[] msg) throws ErrnoException, InterruptedIOException {
private static void sendMessage(
final FileDescriptor fd,
final byte[] msg) throws ErrnoException, InterruptedIOException {
final byte[] lengthBits = new byte[4];
final ByteBuffer bb = ByteBuffer.wrap(lengthBits);
bb.order(ByteOrder.LITTLE_ENDIAN);
bb.putInt(msg.length);
Os.write(mPipe, lengthBits, 0, lengthBits.length);
Os.write(mPipe, msg, 0, msg.length);
writeFully(fd, lengthBits, 0, lengthBits.length);
writeFully(fd, msg, 0, msg.length);
}
EmulatorClipboardMonitor(final Consumer<ClipData> setAndroidClipboard) {
@@ -132,8 +138,11 @@ class EmulatorClipboardMonitor implements Consumer<ClipData> {
new String[]{"text/plain"},
new ClipData.Item(str));
if (LOG_CLIBOARD_ACCESS) {
Slog.i(TAG, "Setting the guest clipboard to '" + str + "'");
}
setAndroidClipboard.accept(clip);
} catch (ErrnoException | InterruptedIOException e) {
} catch (ErrnoException | EOFException | InterruptedIOException e) {
closePipe();
} catch (InterruptedException | IllegalArgumentException e) {
}
@@ -156,13 +165,50 @@ class EmulatorClipboardMonitor implements Consumer<ClipData> {
}
private void setHostClipboardImpl(final String value) {
try {
if (isPipeOpened()) {
sendMessage(value.getBytes());
final FileDescriptor pipeFD = getPipeFD();
if (pipeFD != null) {
Thread t = new Thread(() -> {
if (LOG_CLIBOARD_ACCESS) {
Slog.i(TAG, "Setting the host clipboard to '" + value + "'");
}
try {
sendMessage(pipeFD, value.getBytes());
} catch (ErrnoException | InterruptedIOException e) {
Slog.e(TAG, "Failed to set host clipboard " + e.getMessage());
} catch (IllegalArgumentException e) {
}
});
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);
}
} catch (ErrnoException | InterruptedIOException e) {
Slog.e(TAG, "Failed to set host clipboard " + e.getMessage());
} catch (IllegalArgumentException e) {
}
}
}