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

Merge "Emulator cleanup in ClipboardService.java (send/receive)" am: c4bc4fb144 am: fadfebd06a am: bda0cd8f50

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1634489

Change-Id: Ic9aee266d7d7ade45e39ed6e7957f8fe57a7cfe8
This commit is contained in:
Roman Kiryanov
2021-03-26 02:55:23 +00:00
committed by Automerger Merge Worker
parent e87a4dacd7 bda0cd8f50
commit 6264987a00
1 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
services/core/java/com/android/server/clipboard/ClipboardService.java
View File

@@ -132,6 +132,18 @@ class HostClipboardMonitor implements Runnable {
}
}
private byte[] receiveMessage() throws IOException {
final int size = Integer.reverseBytes(mPipe.readInt());
final byte[] receivedData = new byte[size];
mPipe.readFully(receivedData);
return receivedData;
}
private void sendMessage(byte[] message) throws IOException {
mPipe.writeInt(Integer.reverseBytes(message.length));
mPipe.write(message);
}
public HostClipboardMonitor(HostClipboardCallback cb) {
mHostClipboardCallback = cb;
}
@@ -146,10 +158,8 @@ class HostClipboardMonitor implements Runnable {
while ((mPipe == null) && !openPipe()) {
Thread.sleep(100);
}
int size = mPipe.readInt();
size = Integer.reverseBytes(size);
byte[] receivedData = new byte[size];
mPipe.readFully(receivedData);
final byte[] receivedData = receiveMessage();
mHostClipboardCallback.onHostClipboardUpdated(
new String(receivedData));
} catch (IOException e) {
@@ -161,8 +171,7 @@ class HostClipboardMonitor implements Runnable {
public void setHostClipboard(String content) {
try {
if (mPipe != null) {
mPipe.writeInt(Integer.reverseBytes(content.getBytes().length));
mPipe.write(content.getBytes());
sendMessage(content.getBytes());
}
} catch(IOException e) {
Slog.e("HostClipboardMonitor",