commit 9e5a4ed6c3f02e05f5063cedc0d8dbb0d68e60bd
author Siyamed Sinir <siyamed@google.com> Sat Sep 30 00:03:48 2017 +0000
committer android-build-merger <android-build-merger@google.com> Sat Sep 30 00:03:48 2017 +0000
tree 5a8b844c22848253cfebd4768f4af6b85a10891c
parent f2b592726d569cd0ca6dc702def29deca593ee48
parent 0595b5a94b222ca399ee17c7d672302beb0c5eb4

Fix ClipboardService device lock check for cross profile
am: 0595b5a94b

Change-Id: I6aeaaef43a8e8c5ede049ae9e97fbf6d0129bac4

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 383f116..83ec036 100644
--- a/services/core/java/com/android/server/clipboard/ClipboardService.java
+++ b/services/core/java/com/android/server/clipboard/ClipboardService.java
@@ -307,10 +307,15 @@
     }
 
     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) {