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

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

Change-Id: Ibbd5312c876b93d612060c919498926c05702f35
This commit is contained in:
Roman Kiryanov
2021-03-26 01:18:37 +00:00
committed by Automerger Merge Worker
parent 4e2fbda63d c4bc4fb144
commit fadfebd06a
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

@@ -117,6 +117,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) { public HostClipboardMonitor(HostClipboardCallback cb) {
mHostClipboardCallback = cb; mHostClipboardCallback = cb;
} }
@@ -131,10 +143,8 @@ class HostClipboardMonitor implements Runnable {
while ((mPipe == null) && !openPipe()) { while ((mPipe == null) && !openPipe()) {
Thread.sleep(100); Thread.sleep(100);
} }
int size = mPipe.readInt();
size = Integer.reverseBytes(size); final byte[] receivedData = receiveMessage();
byte[] receivedData = new byte[size];
mPipe.readFully(receivedData);
mHostClipboardCallback.onHostClipboardUpdated( mHostClipboardCallback.onHostClipboardUpdated(
new String(receivedData)); new String(receivedData));
} catch (IOException e) { } catch (IOException e) {
@@ -146,8 +156,7 @@ class HostClipboardMonitor implements Runnable {
public void setHostClipboard(String content) { public void setHostClipboard(String content) {
try { try {
if (mPipe != null) { if (mPipe != null) {
mPipe.writeInt(Integer.reverseBytes(content.getBytes().length)); sendMessage(content.getBytes());
mPipe.write(content.getBytes());
} }
} catch(IOException e) { } catch(IOException e) {
Slog.e("HostClipboardMonitor", Slog.e("HostClipboardMonitor",