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 
am: 8155446b77

Change-Id: I21712b3913ab073d1e0265bc8eb73d9fa33c032c
This commit is contained in:
Siyamed Sinir
2017-09-29 23:28:05 +00:00
committed by android-build-merger
parent 8271e98237 8155446b77
commit 8c8e5ce966
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) {