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

Commit bc560108 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: a0c253d0 am: c275b77b 

am: 1f853665

Change-Id: Idbf65d9e9db40c7dfa2456f3e807890c88dcbb3d
parents 3bb6994a 1f853665

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

        }