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

Perform text classification when emulator sets clipboard.

Browse Source 
This fixes an issue where clipboard clips coming from the emulator
host do not have text classification performed, resulting in the
clip being permanently in the CLAFFICATION_NOT_PERFORMED state.

Bug: 204085258
Test: build; use system image in emulator; manual copy and check
Test: atest ClipDescriptionTest
Test: atest ClipboardManagerTest
Change-Id: Ic89d6e87976ec75a7b9a55e2602619aa6e93ddce
This commit is contained in:
Oli Lan
2022-01-07 16:13:45 +00:00
parent bdbdbe19f8
commit e56e021ed4
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);
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) {