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

Set host's clipboard in a separate thread

Browse Source 
It is not recommended to do IO in the UI thread.

Bug: 219611030
Test: boot AOSP, check if clipboard works
Signed-off-by: Roman Kiryanov <rkir@google.com>
Change-Id: Iaf445ae3e6e009b86ccf4d1783dffeebc165bb62
This commit is contained in:
Roman Kiryanov
2022-03-03 21:33:44 -08:00
parent 52ae3bd2dc
commit ff70f5d9f4
1 changed files with 22 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -54,8 +54,8 @@ class EmulatorClipboardMonitor implements Consumer<ClipData> {
return bits;
}
private boolean isPipeOpened() {
return mPipe != null;
private synchronized FileDescriptor getPipeFD() {
return mPipe;
}
private synchronized boolean openPipe() {
@@ -107,14 +107,16 @@ class EmulatorClipboardMonitor implements Consumer<ClipData> {
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);
Os.write(fd, lengthBits, 0, lengthBits.length);
Os.write(fd, msg, 0, msg.length);
}
EmulatorClipboardMonitor(final Consumer<ClipData> setAndroidClipboard) {
@@ -162,17 +164,22 @@ class EmulatorClipboardMonitor implements Consumer<ClipData> {
}
private void setHostClipboardImpl(final String value) {
if (LOG_CLIBOARD_ACCESS) {
Slog.i(TAG, "Setting the host clipboard to '" + value + "'");
}
final FileDescriptor pipeFD = getPipeFD();
try {
if (isPipeOpened()) {
sendMessage(value.getBytes());
}
} catch (ErrnoException | InterruptedIOException e) {
Slog.e(TAG, "Failed to set host clipboard " + e.getMessage());
} catch (IllegalArgumentException e) {
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();
}
}
}