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

Merge "Bad lock object." am: c4227ee28f am: 456ec4b94a am: 2438767d5e am: f1f03b8f38

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

Change-Id: I702ac94ae3dc212de7ce8313b60e343ab2bda538
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Oli Lan
2022-04-11 19:41:58 +00:00
committed by Automerger Merge Worker
parent 7c6c22dbc7 f1f03b8f38
commit d4b2eb3cf7
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

@@ -665,7 +665,7 @@ public class ClipboardService extends SystemService {
void setPrimaryClipInternal(PerUserClipboard clipboard, @Nullable ClipData clip, void setPrimaryClipInternal(PerUserClipboard clipboard, @Nullable ClipData clip,
int uid) { int uid) {
synchronized ("mLock") { synchronized (mLock) {
setPrimaryClipInternalLocked(clipboard, clip, uid, null); setPrimaryClipInternalLocked(clipboard, clip, uid, null);
} }
} }