diff options
| author | 2022-04-11 20:14:50 +0000 | |
|---|---|---|
| committer | 2022-04-11 20:14:50 +0000 | |
| commit | dc37121b6603337e23e849b683bedb50c76bb65f (patch) | |
| tree | cf1e014ffc909675eb78ff570bfecf5b3b6dd5d6 | |
| parent | 1da0782b9a4a1b5101b50150f5ce04ec5ad871f0 (diff) | |
| parent | d4b2eb3cf7ae2995543e0d9206277fea9fc430bd (diff) | |
Merge "Bad lock object." am: c4227ee28f am: 456ec4b94a am: 2438767d5e am: f1f03b8f38 am: d4b2eb3cf7
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2059634
Change-Id: I66cb791e6a50c04ed8b58ee75c8c078e640cb2d9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | services/core/java/com/android/server/clipboard/ClipboardService.java | 2 |
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 9f46bd6cf28a..3f002449c1eb 100644 --- a/services/core/java/com/android/server/clipboard/ClipboardService.java +++ b/services/core/java/com/android/server/clipboard/ClipboardService.java @@ -665,7 +665,7 @@ public class ClipboardService extends SystemService { void setPrimaryClipInternal(PerUserClipboard clipboard, @Nullable ClipData clip, int uid) { - synchronized ("mLock") { + synchronized (mLock) { setPrimaryClipInternalLocked(clipboard, clip, uid, null); } } |