Merge "Use calling user ID when calling isDeviceLocked" into oc-mr1-dev am: 5182f884f2

am: b8744e7611

Change-Id: Ia937e64d342a2e1d122d7840b3c5b678efc826c3

1 files changed, 2 insertions, 1 deletions

diff --git a/services/core/java/com/android/server/clipboard/ClipboardService.java b/services/core/java/com/android/server/clipboard/ClipboardService.java
index e6228d46e15c..0c9d70a95ab9 100644
--- a/services/core/java/com/android/server/clipboard/ClipboardService.java
+++ b/services/core/java/com/android/server/clipboard/ClipboardService.java
@@ -435,11 +435,12 @@ public class ClipboardService extends SystemService {
     }
 
     private boolean isDeviceLocked() {
+        int callingUserId = UserHandle.getCallingUserId();
         final long token = Binder.clearCallingIdentity();
         try {
             final KeyguardManager keyguardManager = getContext().getSystemService(
                     KeyguardManager.class);
-            return keyguardManager != null && keyguardManager.isDeviceLocked();
+            return keyguardManager != null && keyguardManager.isDeviceLocked(callingUserId);
         } finally {
             Binder.restoreCallingIdentity(token);
         }