commit 7c7945c9592520a366e7fb5a5df516796766859a
author Siyamed Sinir <siyamed@google.com> Sat Sep 30 01:07:30 2017 +0000
committer android-build-merger <android-build-merger@google.com> Sat Sep 30 01:07:30 2017 +0000
tree 5eaf833169713e0717ab45ca07573ac181623dd8
parent 47749a01d75e1c5f1f37fe472c442314344f86f1
parent 9865205a4e25a1d4903faa5a81089a3193989cde

Fix ClipboardService device lock check for cross profile am: 6d79675e0c am: 095eda9307 am: a4f6ca3e77 am: 85439e9114 am: 17735f183a am: d93f91a137
am: 9865205a4e

Change-Id: I7c34d6b58d5aacadd6efa07ce12f9b7e9898768a

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 bdd2d2b..6f59e84 100644
--- a/services/core/java/com/android/server/clipboard/ClipboardService.java
+++ b/services/core/java/com/android/server/clipboard/ClipboardService.java
@@ -315,8 +315,14 @@
     }
 
     private boolean isDeviceLocked() {
-        final KeyguardManager keyguardManager = mContext.getSystemService(KeyguardManager.class);
-        return keyguardManager != null && keyguardManager.isDeviceLocked();
+        final long token = Binder.clearCallingIdentity();
+        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) {