Revert "Fix ClipboardService device lock check for cross profile"

This reverts commit fe293bb994ecc296f6767f8e24f16d31f1f8f3b8.

diff --git a/services/core/java/com/android/server/clipboard/ClipboardService.java b/services/core/java/com/android/server/clipboard/ClipboardService.java
index 6f59e84..bdd2d2b 100644 (file)
--- a/services/core/java/com/android/server/clipboard/ClipboardService.java
+++ b/services/core/java/com/android/server/clipboard/ClipboardService.java
@@ -315,14 +315,8 @@ public class ClipboardService extends IClipboard.Stub {
     }
 
     private boolean isDeviceLocked() {
-        final long token = Binder.clearCallingIdentity();
-        try {
-            final KeyguardManager keyguardManager = mContext.getSystemService(
-                    KeyguardManager.class);
-            return keyguardManager != null && keyguardManager.isDeviceLocked();
-        } finally {
-            Binder.restoreCallingIdentity(token);
-        }
+        final KeyguardManager keyguardManager = mContext.getSystemService(KeyguardManager.class);
+        return keyguardManager != null && keyguardManager.isDeviceLocked();
     }
 
     private final void checkUriOwnerLocked(Uri uri, int uid) {