summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Oli Lan <olilan@google.com> 2022-01-20 12:23:37 +0000
committer Oli Lan <olilan@google.com> 2022-01-20 12:23:37 +0000
commit869f53b3d7cfee5ef6f3ba5fa1acb99dcf1d37e6 (patch)
tree08ba13e3fba16eb8188bc2c3529c45e71839657c
parent0702622783e7a8e0c0c5fb79b6704e12c59602fe (diff)
Do not initiate clip classification again when copying to profile.
This is a follow-on from aosp/1942953. After the changes in that CL, when copying a clip to a profile the new method setPrimaryClipInternalNoClassifyLocked must be used, so that classification is not started multiple times. Bug: 215505009 Test: build and manual check Test: atest ClipDescriptionTest Change-Id: If4b7d863b1aa70d14e28d6cbd0cb9252a606fc66
-rw-r--r--services/core/java/com/android/server/clipboard/ClipboardService.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/clipboard/ClipboardService.java b/services/core/java/com/android/server/clipboard/ClipboardService.java
index 3d5abfe83394..38df5f896000 100644
--- a/services/core/java/com/android/server/clipboard/ClipboardService.java
+++ b/services/core/java/com/android/server/clipboard/ClipboardService.java
@@ -571,7 +571,7 @@ public class ClipboardService extends SystemService {
final boolean canCopyIntoProfile = !hasRestriction(
UserManager.DISALLOW_SHARE_INTO_MANAGED_PROFILE, id);
if (canCopyIntoProfile) {
- setPrimaryClipInternalLocked(
+ setPrimaryClipInternalNoClassifyLocked(
getClipboardLocked(id), clip, uid, sourcePackage);
}
}