From 395e162a0bf21c7e67923b9ae5fc9aded2d128a7 Mon Sep 17 00:00:00 2001 From: Siyamed Sinir Date: Wed, 13 Sep 2017 12:19:41 -0700 Subject: [PATCH] Fix ClipboardService device lock check for cross profile ClipboardService.isDeviceLocked should clear callingIdentity before accessing KeyguardManager. Test: bit CtsDevicePolicyManagerTestCases:com.android.cts.devicepolicy.ManagedProfileTest Bug: 64934810 Change-Id: I712abfe8d542cd1be9c1816f407c8912321ac480 --- .../com/android/server/clipboard/ClipboardService.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/services/core/java/com/android/server/clipboard/ClipboardService.java b/services/core/java/com/android/server/clipboard/ClipboardService.java index efc930ebf8eac..e6228d46e15cc 100644 --- a/services/core/java/com/android/server/clipboard/ClipboardService.java +++ b/services/core/java/com/android/server/clipboard/ClipboardService.java @@ -435,9 +435,14 @@ public class ClipboardService extends SystemService { } private boolean isDeviceLocked() { - final KeyguardManager keyguardManager = getContext().getSystemService( + final long token = Binder.clearCallingIdentity(); + try { + final KeyguardManager keyguardManager = getContext().getSystemService( KeyguardManager.class); - return keyguardManager != null && keyguardManager.isDeviceLocked(); + return keyguardManager != null && keyguardManager.isDeviceLocked(); + } finally { + Binder.restoreCallingIdentity(token); + } } private final void checkUriOwnerLocked(Uri uri, int uid) {