Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Perform text classification when emulator sets clipboard." am: 283edc4982 am: 06e758127c am: dd620989ad

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

Change-Id: Ib0825ad864c1be10fa3c3d1f14e2b3f97efdf780
This commit is contained in:
Oli Lan
2022-01-13 10:54:13 +00:00
committed by Automerger Merge Worker
parent 158b7ac4d3 dd620989ad
commit 7d678a8c57
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
services/core/java/com/android/server/clipboard/ClipboardService.java
View File

@@ -535,9 +535,6 @@ public class ClipboardService extends SystemService {
mEmulatorClipboardMonitor.accept(clip); mEmulatorClipboardMonitor.accept(clip);
final int userId = UserHandle.getUserId(uid); final int userId = UserHandle.getUserId(uid);
if (clip != null) {
startClassificationLocked(clip, userId);
}
// Update this user // Update this user
setPrimaryClipInternalLocked(getClipboardLocked(userId), clip, uid, sourcePackage); setPrimaryClipInternalLocked(getClipboardLocked(userId), clip, uid, sourcePackage);
@@ -593,6 +590,17 @@ public class ClipboardService extends SystemService {
@GuardedBy("mLock") @GuardedBy("mLock")
private void setPrimaryClipInternalLocked(PerUserClipboard clipboard, @Nullable ClipData clip, private void setPrimaryClipInternalLocked(PerUserClipboard clipboard, @Nullable ClipData clip,
int uid, @Nullable String sourcePackage) { 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); revokeUris(clipboard);
clipboard.activePermissionOwners.clear(); clipboard.activePermissionOwners.clear();
if (clip == null && clipboard.primaryClip == null) { if (clip == null && clipboard.primaryClip == null) {