Merge "Emulator cleanup in ClipboardService.java (closePipe)"

2021-03-23 07:04:40 +00:00
parent fb5d22ffea e9cede4883
commit 43a464cb70
1 changed files with 12 additions and 4 deletions
--- a/services/core/java/com/android/server/clipboard/ClipboardService.java
+++ b/services/core/java/com/android/server/clipboard/ClipboardService.java
@@ -106,6 +106,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;
    }
@@ -127,10 +138,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) {}
        }
    }