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

Merge "Fix ClipboardService device lock check for cross profile" into oc-dev

Browse Source
This commit is contained in:
Siyamed Sinir
2017-09-29 23:15:06 +00:00
committed by Android (Google) Code Review
parent 5f76e0c11d 395e162a0b
commit 8155446b77
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -435,9 +435,14 @@ public class ClipboardService extends SystemService {
} }
private boolean isDeviceLocked() { private boolean isDeviceLocked() {
final KeyguardManager keyguardManager = getContext().getSystemService( final long token = Binder.clearCallingIdentity();
try {
final KeyguardManager keyguardManager = getContext().getSystemService(
KeyguardManager.class); KeyguardManager.class);
return keyguardManager != null && keyguardManager.isDeviceLocked(); return keyguardManager != null && keyguardManager.isDeviceLocked();
} finally {
Binder.restoreCallingIdentity(token);
}
} }
private final void checkUriOwnerLocked(Uri uri, int uid) { private final void checkUriOwnerLocked(Uri uri, int uid) {