commit f11f0311900ed57e69565529a44922fbb71a53af
author Treehugger Robot <treehugger-gerrit@google.com> Thu Jan 27 18:49:27 2022 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Jan 27 18:49:27 2022 +0000
tree 93e28b6fee75094878889a81aa708c7424e79fd7
parent 1dd24999da762faf6fd3f77142cdbd3c326c11c2
parent 869f53b3d7cfee5ef6f3ba5fa1acb99dcf1d37e6

Merge "Do not initiate clip classification again when copying to profile."

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

diff --git a/services/core/java/com/android/server/clipboard/ClipboardService.java b/services/core/java/com/android/server/clipboard/ClipboardService.java
index 3d5abfe..38df5f8 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 @@
                         final boolean canCopyIntoProfile = !hasRestriction(
                                 UserManager.DISALLOW_SHARE_INTO_MANAGED_PROFILE, id);
                         if (canCopyIntoProfile) {
-                            setPrimaryClipInternalLocked(
+                            setPrimaryClipInternalNoClassifyLocked(
                                     getClipboardLocked(id), clip, uid, sourcePackage);
                         }
                     }