From 22f4262fe04369f9633b2449c31b4332a6589db2 Mon Sep 17 00:00:00 2001 From: Roman Kiryanov Date: Thu, 9 Feb 2023 16:04:39 -0800 Subject: [PATCH] Set the host clipboard only for DEVICE_ID_DEFAULT device our host does not support clipboards per virtual device. [C-10-7] MUST use a separate clipboard solely for each virtual device (or disable the clipboard for virtual devices) Bug: 262038440 Test: presubmit Change-Id: I5b728ec352c8e856618a40f797b49e78ab5085e8 Signed-off-by: Roman Kiryanov --- .../java/com/android/server/clipboard/ClipboardService.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/services/core/java/com/android/server/clipboard/ClipboardService.java b/services/core/java/com/android/server/clipboard/ClipboardService.java index ecff0a7905592..f7183e6b3ba73 100644 --- a/services/core/java/com/android/server/clipboard/ClipboardService.java +++ b/services/core/java/com/android/server/clipboard/ClipboardService.java @@ -824,7 +824,9 @@ public class ClipboardService extends SystemService { @GuardedBy("mLock") private void setPrimaryClipInternalLocked( @Nullable ClipData clip, int uid, int deviceId, @Nullable String sourcePackage) { - mEmulatorClipboardMonitor.accept(clip); + if (deviceId == DEVICE_ID_DEFAULT) { + mEmulatorClipboardMonitor.accept(clip); + } final int userId = UserHandle.getUserId(uid);