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

Commit c613e4e4 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge changes I9ba57f43,I236b039c into tm-dev am: 3c6f225e 

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



Change-Id: Id305739bf5884f28c3d247ab49e82e0236c2e918
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents a1ee8846 3c6f225e

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

+31 −22
Original line number Diff line number Diff line
@@ -169,27 +169,37 @@ class EmulatorClipboardMonitor implements Consumer<ClipData> { 


    @Override

    public void accept(final @Nullable ClipData clip) {

        final FileDescriptor fd = getPipeFD();

        if (fd != null) {

            setHostClipboard(fd, getClipString(clip));

        }

    }



    private String getClipString(final @Nullable ClipData clip) {

        if (clip == null) {

            setHostClipboardImpl("");

        } else if (clip.getItemCount() > 0) {

            final CharSequence text = clip.getItemAt(0).getText();

            if (text != null) {

                setHostClipboardImpl(text.toString());

            return "";

        }



        if (clip.getItemCount() == 0) {

            return "";

        }



        final CharSequence text = clip.getItemAt(0).getText();

        if (text == null) {

            return "";

        }



    private void setHostClipboardImpl(final String value) {

        final FileDescriptor pipeFD = getPipeFD();

        return text.toString();

    }



        if (pipeFD != null) {

    private static void setHostClipboard(final FileDescriptor fd, final String value) {

        Thread t = new Thread(() -> {

            if (LOG_CLIBOARD_ACCESS) {

                Slog.i(TAG, "Setting the host clipboard to '" + value + "'");

            }



            try {

                    sendMessage(pipeFD, value.getBytes());

                sendMessage(fd, value.getBytes());

            } catch (ErrnoException | InterruptedIOException e) {

                Slog.e(TAG, "Failed to set host clipboard " + e.getMessage());

            } catch (IllegalArgumentException e) {
@@ -197,7 +207,6 @@ class EmulatorClipboardMonitor implements Consumer<ClipData> { 
        });

        t.start();

    }

    }



    private static void readFully(final FileDescriptor fd,

                                  final byte[] buf, int offset, int size)