commit e70be3f342978cacf14e1818312cf7513592690f
author Siyamed Sinir <siyamed@google.com> Wed Sep 13 12:19:41 2017 -0700
committer Nikoli Cartagena <dargeren@google.com> Mon Oct 02 10:07:46 2017 -0700
tree c715f2a1f87dd245ba503f71471ec272bf60cee2
parent f4263a7f206f87c1fae05f2918433fb725957b99

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
(cherry picked from commit 395e162a0bf21c7e67923b9ae5fc9aded2d128a7)

services/core/java/com/android/server/clipboard/ClipboardService.java

diff --git a/services/core/java/com/android/server/clipboard/ClipboardService.java b/services/core/java/com/android/server/clipboard/ClipboardService.java
index efc930e..e6228d4 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 @@
     }
 
     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) {