From 546fbc8bf7b385e01ad1efbdfb41cb604f26d148 Mon Sep 17 00:00:00 2001 From: Kai Peng Date: Mon, 11 Apr 2022 12:41:37 +0000 Subject: Bad lock object. Locking on an interned string can cause unexpected locking collisions, and we should lock the mLock object here. Change-Id: I8b6557371b0cb79e1bcbc732982cf66b9de663a5 --- services/core/java/com/android/server/clipboard/ClipboardService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/core/java/com/android/server/clipboard/ClipboardService.java b/services/core/java/com/android/server/clipboard/ClipboardService.java index a0c5aa364f0d..863be98606f0 100644 --- a/services/core/java/com/android/server/clipboard/ClipboardService.java +++ b/services/core/java/com/android/server/clipboard/ClipboardService.java @@ -582,7 +582,7 @@ public class ClipboardService extends SystemService { void setPrimaryClipInternal(PerUserClipboard clipboard, @Nullable ClipData clip, int uid) { - synchronized ("mLock") { + synchronized (mLock) { setPrimaryClipInternalLocked(clipboard, clip, uid, null); } } -- cgit v1.2.3-59-g8ed1b