Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: Ia8f1a4823d965519d0ff32b9cbe6aca32cd0db41
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:34:39 +00:00
committed by Automerger Merge Worker
parent 03544c3c3b b0658303cd
commit 74d4958c94
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
services/core/java/com/android/server/clipboard/ClipboardService.java
View File

@@ -1389,6 +1389,11 @@ public class ClipboardService extends SystemService {
callingPackage) == PackageManager.PERMISSION_GRANTED) { callingPackage) == PackageManager.PERMISSION_GRANTED) {
return; 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. // Don't notify if already notified for this uid and clip.
if (clipboard.mNotifiedUids.get(uid)) { if (clipboard.mNotifiedUids.get(uid)) {
return; return;