From e9cede4883b20f5cbaaeeed5fff53a6649d4ceab Mon Sep 17 00:00:00 2001
From: Roman Kiryanov <rkir@google.com>
Date: Fri, 12 Mar 2021 16:48:59 -0800
Subject: Emulator cleanup in ClipboardService.java (closePipe)

Bug: 182436079
Test: presubmit
Signed-off-by: Roman Kiryanov <rkir@google.com>
Change-Id: I08563b24c356e7519ffe6cf6020d301ab086fa70
---
 .../com/android/server/clipboard/ClipboardService.java   | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

(limited to 'services')

diff --git a/services/core/java/com/android/server/clipboard/ClipboardService.java b/services/core/java/com/android/server/clipboard/ClipboardService.java
index 6776f49b7d8f..d4eb104fa897 100644
--- 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) {}
         }
     }
-- 
cgit v1.2.3