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 oc-dev

Browse Source 
am: 31bcb22572

Change-Id: I9751a0c4dd069908e1d0a1a5d3657c7b5c7c1005
This commit is contained in:
Siyamed Sinir
2017-10-31 16:31:04 +00:00
committed by android-build-merger
parent f247977cbe 31bcb22572
commit 88f92e101d
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

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