commit 17735f183a3b7e3e1f89049865ddaa4eee6f3985
author Siyamed Sinir <siyamed@google.com> Sat Sep 30 00:37:54 2017 +0000
committer android-build-merger <android-build-merger@google.com> Sat Sep 30 00:37:54 2017 +0000
tree 81f153a870ddbc0e0de43b4c0f5d0973c731f58a
parent 0bdb7902d809c9789f1475e86327664bc760042d
parent 85439e91147f0d8f1fd3531299be92905afea75e

Fix ClipboardService device lock check for cross profile am: 6d79675e0c am: 095eda9307 am: a4f6ca3e77
am: 85439e9114

Change-Id: Ic616bde55a3a60eec10d9330907e6d8164b76c86

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 a94a524..28028ce 100644
--- a/services/core/java/com/android/server/clipboard/ClipboardService.java
+++ b/services/core/java/com/android/server/clipboard/ClipboardService.java
@@ -307,8 +307,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) {