commit 0dccfe99e383c3c8d10a523b79f396d19cf7dd14
author Fyodor Kupolov <fkupolov@google.com> Thu Oct 12 11:22:57 2017 -0700
committer android-build-team Robot <android-build-team-robot@google.com> Fri Dec 01 00:18:53 2017 +0000
tree a3ad8f247f143c4c87429672abbb0f5f650b8a49
parent c81bd423173a689131b5dd132a277af34348123e

Use calling user ID when calling isDeviceLocked

If isDeviceLocked is called with clearCallingIdentity,
original userId should be explicitly passed

Bug: 67621847
Test: Manual
Change-Id: I2bcb92572898811cc96bda1149ef806e6239e929
(cherry picked from commit ded7332328149bfd1041318e8c26395a9ee30cfc)

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);
         }