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

Browse Source
This commit is contained in:
Antony Sargent
2023-05-10 01:14:20 +00:00
committed by Android (Google) Code Review
parent 8c9bc646eb 62280d26ff
commit b0658303cd
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;