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

Merge "Emulator cleanup in ClipboardService.java (closePipe)" am: 43a464cb70 am: 828f46619b am: 5803e055b9 am: 47bc18bd45

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

Change-Id: I318b558bab8fbe2dcde7d618115d5e27694adfab
This commit is contained in:
Treehugger Robot
2021-03-23 14:37:25 +00:00
committed by Automerger Merge Worker
parent b9ade2a0b2 47bc18bd45
commit ba2184d567
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -121,6 +121,17 @@ class HostClipboardMonitor implements Runnable {
return false;
}
private void closePipe() {
try {
final RandomAccessFile pipe = mPipe;
mPipe = null;
if (pipe != null) {
pipe.close();
}
} catch (IOException ignore) {
}
}
public HostClipboardMonitor(HostClipboardCallback cb) {
mHostClipboardCallback = cb;
}
@@ -142,10 +153,7 @@ class HostClipboardMonitor implements Runnable {
mHostClipboardCallback.onHostClipboardUpdated(
new String(receivedData));
} catch (IOException e) {
try {
mPipe.close();
} catch (IOException ee) {}
mPipe = null;
closePipe();
} catch (InterruptedException e) {}
}
}