commit a0c253d07ad8a1d208311e29370d4de235e656a9
author Siyamed Sinir <siyamed@google.com> Tue Oct 31 16:17:06 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Oct 31 16:17:06 2017 +0000
tree 3332fe73a1dd05aac78d03972ae148c2c18d3d19
parent 08bd3a75fba4101427788296cad98c45316166f5
parent ded7332328149bfd1041318e8c26395a9ee30cfc

Merge "Use calling user ID when calling isDeviceLocked" into mnc-dev

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 28028ce..57f68f2 100644
--- a/services/core/java/com/android/server/clipboard/ClipboardService.java
+++ b/services/core/java/com/android/server/clipboard/ClipboardService.java
@@ -307,11 +307,12 @@
     }
 
     private boolean isDeviceLocked() {
+        int callingUserId = UserHandle.getCallingUserId();
         final long token = Binder.clearCallingIdentity();
         try {
             final KeyguardManager keyguardManager = mContext.getSystemService(
                     KeyguardManager.class);
-            return keyguardManager != null && keyguardManager.isDeviceLocked();
+            return keyguardManager != null && keyguardManager.isDeviceLocked(callingUserId);
         } finally {
             Binder.restoreCallingIdentity(token);
         }