Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7bd25805 authored by Antony Sargent's avatar Antony Sargent Committed by Automerger Merge Worker
Browse files

Merge "Skip clipboard access toasts for VirtualDevice owner app" into udc-dev... 

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

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



Change-Id: I1592511d7ea2edb7eeea1515f2b5681006151afe
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents ff580f82 4d5f07d6

services/core/java/com/android/server/clipboard/ClipboardService.java

+5 −0
Original line number Diff line number Diff line
@@ -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;