From 62280d26ff435ce32e0d0c9957802ee9afe61cc4 Mon Sep 17 00:00:00 2001 From: Antony Sargent Date: Mon, 24 Apr 2023 15:58:32 -0700 Subject: [PATCH] Skip clipboard access toasts for VirtualDevice owner app When the privileged app which owns a VirtualDevice reads the siloed clipboard reserved for that VirtualDevice, don't show a toast. Bug: 276507183 Test: atest StreamedAppClipboardToast Change-Id: I5d228191e58306980ca77940792e0dda9f1bc875 --- .../java/com/android/server/clipboard/ClipboardService.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/services/core/java/com/android/server/clipboard/ClipboardService.java b/services/core/java/com/android/server/clipboard/ClipboardService.java index fab138bb29319..4b8b43134e6c3 100644 --- a/services/core/java/com/android/server/clipboard/ClipboardService.java +++ b/services/core/java/com/android/server/clipboard/ClipboardService.java @@ -1389,6 +1389,11 @@ public class ClipboardService extends SystemService { callingPackage) == PackageManager.PERMISSION_GRANTED) { return; } + // Don't notify if this access is coming from the privileged app which owns the device. + if (clipboard.deviceId != DEVICE_ID_DEFAULT && mVdmInternal.getDeviceOwnerUid( + clipboard.deviceId) == uid) { + return; + } // Don't notify if already notified for this uid and clip. if (clipboard.mNotifiedUids.get(uid)) { return;