summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author TreeHugger Robot <treehugger-gerrit@google.com> 2022-05-12 03:47:02 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-05-12 03:47:02 +0000
commit2ffbf921fa9c4fbd7f8deb801eac94d33368a11f (patch)
tree30065e66a7a80c206b09772311cfeaabc6763b14
parent16c88c11749d9fcf4c90f121b5f4835f0e0a9315 (diff)
parent166d42d30398fc9ae76fdb4958929588442954e9 (diff)
Merge "Label emulator clipboards with `SUPPRESS_CLIPBOARD_OVERLAY`" into tm-dev am: c54118d1ea am: 166d42d303
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18306272 Change-Id: I294db27600a7dfa047b37fcb82a306ad02f7faaf Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--services/core/java/com/android/server/clipboard/EmulatorClipboardMonitor.java4
1 files changed, 4 insertions, 0 deletions
diff --git a/services/core/java/com/android/server/clipboard/EmulatorClipboardMonitor.java b/services/core/java/com/android/server/clipboard/EmulatorClipboardMonitor.java
index 0944c57d121f..c37d4c6bcaef 100644
--- a/services/core/java/com/android/server/clipboard/EmulatorClipboardMonitor.java
+++ b/services/core/java/com/android/server/clipboard/EmulatorClipboardMonitor.java
@@ -18,6 +18,7 @@ package com.android.server.clipboard;
import android.annotation.Nullable;
import android.content.ClipData;
+import android.os.PersistableBundle;
import android.os.SystemProperties;
import android.system.ErrnoException;
import android.system.Os;
@@ -137,6 +138,9 @@ class EmulatorClipboardMonitor implements Consumer<ClipData> {
final ClipData clip = new ClipData("host clipboard",
new String[]{"text/plain"},
new ClipData.Item(str));
+ final PersistableBundle bundle = new PersistableBundle();
+ bundle.putBoolean("com.android.systemui.SUPPRESS_CLIPBOARD_OVERLAY", true);
+ clip.getDescription().setExtras(bundle);
if (LOG_CLIBOARD_ACCESS) {
Slog.i(TAG, "Setting the guest clipboard to '" + str + "'");