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

Commit 8c8e5ce9 authored by Siyamed Sinir's avatar Siyamed Sinir Committed by android-build-merger
Browse files

Merge "Fix ClipboardService device lock check for cross profile" into oc-dev 

am: 8155446b

Change-Id: I21712b3913ab073d1e0265bc8eb73d9fa33c032c
parents 8271e982 8155446b

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

+7 −2
Original line number Diff line number Diff line
@@ -435,9 +435,14 @@ public class ClipboardService extends SystemService { 
    }



    private boolean isDeviceLocked() {

        final long token = Binder.clearCallingIdentity();

        try {

            final KeyguardManager keyguardManager = getContext().getSystemService(

                    KeyguardManager.class);

            return keyguardManager != null && keyguardManager.isDeviceLocked();

        } finally {

            Binder.restoreCallingIdentity(token);

        }

    }



    private final void checkUriOwnerLocked(Uri uri, int uid) {