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

Commit 26e410bf authored by Roman Kiryanov's avatar Roman Kiryanov Committed by Automerger Merge Worker
Browse files

Merge "Cleanup in EmulatorClipboardMonitor (3)" am: 306e3bb8 

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



Change-Id: Ib23f02ee4f73376bf30596e8d634e432856bbb19
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 3290c29c 306e3bb8

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

+31 −32
Original line number Original line Diff line number Diff line
@@ -83,11 +83,8 @@ class EmulatorClipboardMonitor implements Consumer<ClipData> { 
        return null;

        return null;

    }

    }





    private void openPipe() throws InterruptedException {

    private static FileDescriptor openPipe() throws InterruptedException {

        FileDescriptor fd = getPipeFD();

        FileDescriptor fd = openPipeImpl();



        if (fd == null) {

            fd = openPipeImpl();





        // There's no guarantee that QEMU pipes will be ready at the moment

        // There's no guarantee that QEMU pipes will be ready at the moment

        // this method is invoked. We simply try to get the pipe open and

        // this method is invoked. We simply try to get the pipe open and
@@ -96,32 +93,21 @@ class EmulatorClipboardMonitor implements Consumer<ClipData> { 
            Thread.sleep(100);

            Thread.sleep(100);

            fd = openPipeImpl();

            fd = openPipeImpl();

        }

        }

        }





        setPipeFD(fd);

        return fd;

    }



    private synchronized void closePipe() {

        try {

            final FileDescriptor fd = mPipe;

            mPipe = null;

            if (fd != null) {

                Os.close(fd);

            }

        } catch (ErrnoException ignore) {

        }

    }

    }





    private byte[] receiveMessage() throws ErrnoException, InterruptedIOException, EOFException {

    private static byte[] receiveMessage(final FileDescriptor fd) throws ErrnoException,

            InterruptedIOException, EOFException {

        final byte[] lengthBits = new byte[4];

        final byte[] lengthBits = new byte[4];

        readFully(mPipe, lengthBits, 0, lengthBits.length);

        readFully(fd, lengthBits, 0, lengthBits.length);





        final ByteBuffer bb = ByteBuffer.wrap(lengthBits);

        final ByteBuffer bb = ByteBuffer.wrap(lengthBits);

        bb.order(ByteOrder.LITTLE_ENDIAN);

        bb.order(ByteOrder.LITTLE_ENDIAN);

        final int msgLen = bb.getInt();

        final int msgLen = bb.getInt();





        final byte[] msg = new byte[msgLen];

        final byte[] msg = new byte[msgLen];

        readFully(mPipe, msg, 0, msg.length);

        readFully(fd, msg, 0, msg.length);





        return msg;

        return msg;

    }

    }
@@ -140,11 +126,16 @@ class EmulatorClipboardMonitor implements Consumer<ClipData> { 




    EmulatorClipboardMonitor(final Consumer<ClipData> setAndroidClipboard) {

    EmulatorClipboardMonitor(final Consumer<ClipData> setAndroidClipboard) {

        this.mHostMonitorThread = new Thread(() -> {

        this.mHostMonitorThread = new Thread(() -> {

            FileDescriptor fd = null;



            while (!Thread.interrupted()) {

            while (!Thread.interrupted()) {

                try {

                try {

                    openPipe();

                    if (fd == null) {

                        fd = openPipe();

                        setPipeFD(fd);

                    }





                    final byte[] receivedData = receiveMessage();

                    final byte[] receivedData = receiveMessage(fd);





                    final String str = new String(receivedData);

                    final String str = new String(receivedData);

                    final ClipData clip = new ClipData("host clipboard",

                    final ClipData clip = new ClipData("host clipboard",
@@ -158,9 +149,17 @@ class EmulatorClipboardMonitor implements Consumer<ClipData> { 
                        Slog.i(TAG, "Setting the guest clipboard to '" + str + "'");

                        Slog.i(TAG, "Setting the guest clipboard to '" + str + "'");

                    }

                    }

                    setAndroidClipboard.accept(clip);

                    setAndroidClipboard.accept(clip);

                } catch (ErrnoException | EOFException | InterruptedIOException e) {

                } catch (ErrnoException | EOFException | InterruptedIOException

                    closePipe();

                         | InterruptedException e) {

                } catch (InterruptedException | IllegalArgumentException e) {

                    setPipeFD(null);



                    try {

                        Os.close(fd);

                    } catch (ErrnoException e2) {

                        // ignore

                    }



                    fd = null;

                }

                }

            }

            }

        });

        });