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

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

Merge "Use calling user ID when calling isDeviceLocked" into mnc-dev am:... 

Merge "Use calling user ID when calling isDeviceLocked" into mnc-dev am: a0c253d0 am: c275b77b am: 1f853665
am: bc560108

Change-Id: I2e2cc32e794f498843e6d6f468fdc6e9f8fc5026
parents 914bc14e bc560108

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

+2 −1
Original line number Diff line number Diff line
@@ -307,11 +307,12 @@ public class ClipboardService extends IClipboard.Stub { 
    }



    private boolean isDeviceLocked() {

        int callingUserId = UserHandle.getCallingUserId();

        final long token = Binder.clearCallingIdentity();

        try {

            final KeyguardManager keyguardManager = mContext.getSystemService(

                    KeyguardManager.class);

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

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

        } finally {

            Binder.restoreCallingIdentity(token);

        }