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

Merge "Do not initiate clip classification again when copying to profile." am: f11f031190 am: 9fcba4d7c7 am: c453400201

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

Change-Id: I8ace8b7b0cbe4fb2b6b66968efcda4d9acc3edc2
This commit is contained in:
Treehugger Robot
2022-01-27 19:35:07 +00:00
committed by Automerger Merge Worker
parent 43026dfe9d c453400201
commit ed080c15a3
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -571,7 +571,7 @@ public class ClipboardService extends SystemService {
final boolean canCopyIntoProfile = !hasRestriction( final boolean canCopyIntoProfile = !hasRestriction(
UserManager.DISALLOW_SHARE_INTO_MANAGED_PROFILE, id); UserManager.DISALLOW_SHARE_INTO_MANAGED_PROFILE, id);
if (canCopyIntoProfile) { if (canCopyIntoProfile) {
setPrimaryClipInternalLocked( setPrimaryClipInternalNoClassifyLocked(
getClipboardLocked(id), clip, uid, sourcePackage); getClipboardLocked(id), clip, uid, sourcePackage);
} }
} }