Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 47bc18bd authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Emulator cleanup in ClipboardService.java (closePipe)" am: 43a464cb... 

Merge "Emulator cleanup in ClipboardService.java (closePipe)" am: 43a464cb am: 828f4661 am: 5803e055

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

Change-Id: Ibb0ffb33f4659bf50b2895834bb6856ef66e0958
parents 5ca04e02 5803e055

services/core/java/com/android/server/clipboard/ClipboardService.java

+12 −4
Original line number Diff line number Diff line
@@ -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) {}

        }

    }