Merge "Set the host clipboard only for DEVICE_ID_DEFAULT device"

2023-02-10 16:57:30 +00:00
parent 12a5d4d1d7 22f4262fe0
commit dd49a94fe0
1 changed files with 3 additions and 1 deletions
--- 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);