Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
am: c275b77b03

Change-Id: Ia2887869c4ac6cdcd1a66372b991b9f78edf7679
This commit is contained in:
Siyamed Sinir
2017-10-31 16:34:29 +00:00
committed by android-build-merger
parent 2f8dbe9693 c275b77b03
commit 1f8536653b
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
services/core/java/com/android/server/clipboard/ClipboardService.java
View File

@@ -307,11 +307,12 @@ public class ClipboardService extends IClipboard.Stub {
} }
private boolean isDeviceLocked() { private boolean isDeviceLocked() {
int callingUserId = UserHandle.getCallingUserId();
final long token = Binder.clearCallingIdentity(); final long token = Binder.clearCallingIdentity();
try { try {
final KeyguardManager keyguardManager = mContext.getSystemService( final KeyguardManager keyguardManager = mContext.getSystemService(
KeyguardManager.class); KeyguardManager.class);
return keyguardManager != null && keyguardManager.isDeviceLocked(); return keyguardManager != null && keyguardManager.isDeviceLocked(callingUserId);
} finally { } finally {
Binder.restoreCallingIdentity(token); Binder.restoreCallingIdentity(token);
} }