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

Commit 5ecd14bb authored by Siyamed Sinir's avatar Siyamed Sinir Committed by android-build-merger
Browse files

Merge "Use calling user ID when calling isDeviceLocked" into oc-mr1-dev am: 5182f884 

am: b8744e76

Change-Id: Ia937e64d342a2e1d122d7840b3c5b678efc826c3
parents 8cd461a8 b8744e76

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

+2 −1
Original line number Diff line number Diff line
@@ -435,11 +435,12 @@ public class ClipboardService extends SystemService { 
    }



    private boolean isDeviceLocked() {

        int callingUserId = UserHandle.getCallingUserId();

        final long token = Binder.clearCallingIdentity();

        try {

            final KeyguardManager keyguardManager = getContext().getSystemService(

                    KeyguardManager.class);

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

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

        } finally {

            Binder.restoreCallingIdentity(token);

        }