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

Commit 06e75812 authored by Oli Lan's avatar Oli Lan Committed by Automerger Merge Worker
Browse files

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

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

Change-Id: I860edb880ebeb16027a657d77b75793665bf3b6d
parents 4a14072d 283edc49

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

+11 −3
Original line number Diff line number Diff line
@@ -535,9 +535,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);
@@ -593,6 +590,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) {