Merge "Skip clipboard access toasts for VirtualDevice owner app" into udc-dev am: b0658303cd
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22829406 Change-Id: Id7826bbe459e87155d10f1882a21068a2bb24458 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -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;
|
||||
|
||||
Reference in New Issue
Block a user