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

Fix ClipboardService device lock check for cross profile

Browse Source 
am: 0595b5a94b

Change-Id: I6aeaaef43a8e8c5ede049ae9e97fbf6d0129bac4
This commit is contained in:
Siyamed Sinir
2017-09-30 00:03:48 +00:00
committed by android-build-merger
parent f2b592726d 0595b5a94b
commit 9e5a4ed6c3
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -307,10 +307,15 @@ public class ClipboardService extends IClipboard.Stub {
}
private boolean isDeviceLocked() {
final KeyguardManager keyguardManager = (KeyguardManager) mContext.getSystemService(
Context.KEYGUARD_SERVICE);
return keyguardManager != null && keyguardManager.isKeyguardLocked()
final long token = Binder.clearCallingIdentity();
try {
final KeyguardManager keyguardManager = (KeyguardManager) mContext.getSystemService(
Context.KEYGUARD_SERVICE);
return keyguardManager != null && keyguardManager.isKeyguardLocked()
&& keyguardManager.isKeyguardSecure();
} finally {
Binder.restoreCallingIdentity(token);
}
}
private final void checkUriOwnerLocked(Uri uri, int uid) {