Merge "Bad lock object." am: c4227ee28f am: 456ec4b94a am: 2438767d5e
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2059634 Change-Id: I7f3acb5a73ff25ab6d80f6b10d4586d7b25a3375 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -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);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user