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
This commit is contained in:
Siyamed Sinir
2017-10-31 16:16:16 +00:00
committed by Android (Google) Code Review
parent 66ca42d5ac 66bde67120
commit 31bcb22572
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() { private boolean isDeviceLocked() {
int callingUserId = UserHandle.getCallingUserId();
final long token = Binder.clearCallingIdentity(); final long token = Binder.clearCallingIdentity();
try { try {
final KeyguardManager keyguardManager = getContext().getSystemService( final KeyguardManager keyguardManager = getContext().getSystemService(
KeyguardManager.class); KeyguardManager.class);
return keyguardManager != null && keyguardManager.isDeviceLocked(); return keyguardManager != null && keyguardManager.isDeviceLocked(callingUserId);
} finally { } finally {
Binder.restoreCallingIdentity(token); Binder.restoreCallingIdentity(token);
} }