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

Commit b8744e76 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

Change-Id: Iba84de809f74507587077857e2067f83ad28b313
parents fa3cc209 5182f884

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

        }