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

Commit cc2fcef3 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 am: eeb90235 am: eb863a6b am: b353fbcb
am: 9422f6e9

Change-Id: I0097c1c1780c285adfd17c9faf277acbcaf9803d
parents db258ebb 9422f6e9

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

+2 −1
Original line number Diff line number Diff line
@@ -315,11 +315,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);

        }