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

Commit 9f56f694 authored by Oli Lan's avatar Oli Lan Committed by Automerger Merge Worker
Browse files

Merge "Perform text classification when emulator sets clipboard." am:... 

Merge "Perform text classification when emulator sets clipboard." am: 283edc49 am: 06e75812 am: dd620989 am: 7d678a8c

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

Change-Id: I79c47812f1daddca054244ef61ebb499e3a5f1a4
parents c7900443 7d678a8c

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

+11 −3
Original line number Diff line number Diff line
@@ -614,9 +614,6 @@ public class ClipboardService extends SystemService { 
        mEmulatorClipboardMonitor.accept(clip);



        final int userId = UserHandle.getUserId(uid);

        if (clip != null) {

            startClassificationLocked(clip, userId);

        }



        // Update this user

        setPrimaryClipInternalLocked(getClipboardLocked(userId), clip, uid, sourcePackage);
@@ -672,6 +669,17 @@ public class ClipboardService extends SystemService { 
    @GuardedBy("mLock")

    private void setPrimaryClipInternalLocked(PerUserClipboard clipboard, @Nullable ClipData clip,

            int uid, @Nullable String sourcePackage) {

        final int userId = UserHandle.getUserId(uid);

        if (clip != null) {

            startClassificationLocked(clip, userId);

        }



        setPrimaryClipInternalNoClassifyLocked(clipboard, clip, uid, sourcePackage);

    }



    @GuardedBy("mLock")

    private void setPrimaryClipInternalNoClassifyLocked(PerUserClipboard clipboard,

            @Nullable ClipData clip, int uid, @Nullable String sourcePackage) {

        revokeUris(clipboard);

        clipboard.activePermissionOwners.clear();

        if (clip == null && clipboard.primaryClip == null) {