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

Commit 3ff708b6 authored by Siyamed Sinir's avatar Siyamed Sinir Committed by Android (Google) Code Review
Browse files

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

parents b8ae843a 3f679f87

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) {