Merge "Skip clipboard access toasts for VirtualDevice owner app" into udc-dev am: b0658303cd am: 4d5f07d694

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

Change-Id: I1592511d7ea2edb7eeea1515f2b5681006151afe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Antony Sargent
2023-05-10 01:52:42 +00:00
committed by Automerger Merge Worker

View File

@@ -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;