Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit aac5468c authored by Oli Lan's avatar Oli Lan Committed by Automerger Merge Worker
Browse files

Merge "Bad lock object." am: c4227ee2 am: 456ec4b9 am: 2438767d am: f1f03b8f am: fb6b9075 

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



Change-Id: I89daac9ff294ab7f0e6d47ef4c82a4bdca7c8d65
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents da216972 fb6b9075

services/core/java/com/android/server/clipboard/ClipboardService.java

+1 −1
Original line number Diff line number Diff line
@@ -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);

        }

    }