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 am: c275b77b03 am: 1f8536653b am: bc56010856 am: eeb90235bf am: eb863a6b2e

Browse Source 
am: b353fbcb7a

Change-Id: Iba3d14106f47f98643a6a02b67bcc14437755217
This commit is contained in:
Siyamed Sinir
2017-10-31 17:41:58 +00:00
committed by android-build-merger
parent 5330335288 b353fbcb7a
commit 9422f6e991
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

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