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 
ClipboardService.isDeviceLocked should clear callingIdentity before
accessing KeyguardManager.

Test: bit CtsDevicePolicyManagerTestCases:com.android.cts.devicepolicy.ManagedProfileTest

Bug: 64934810
Change-Id: I81a7adac8c9d56ed801ffc1380fcbc987d5df3e6
Merged-In: I712abfe8d542cd1be9c1816f407c8912321ac480
This commit is contained in:
Siyamed Sinir
2017-09-13 16:32:21 -07:00
parent 89a94b706d
commit 6d79675e0c
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -307,8 +307,14 @@ public class ClipboardService extends IClipboard.Stub {
} }
private boolean isDeviceLocked() { private boolean isDeviceLocked() {
final KeyguardManager keyguardManager = mContext.getSystemService(KeyguardManager.class); final long token = Binder.clearCallingIdentity();
return keyguardManager != null && keyguardManager.isDeviceLocked(); try {
final KeyguardManager keyguardManager = mContext.getSystemService(
KeyguardManager.class);
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) {