Merge "KeyguardManager: Fix user resolution of isDeviceSecure/Locked"

2017-01-23 22:21:03 +00:00
parent 2536cc6872 0b1853f997
commit 5304e89dfd
1 changed files with 2 additions and 2 deletions
--- a/core/java/android/app/KeyguardManager.java
+++ b/core/java/android/app/KeyguardManager.java
@@ -322,7 +322,7 @@ public class KeyguardManager {
     * password.
     */
    public boolean isDeviceLocked() {
-        return isDeviceLocked(UserHandle.getCallingUserId());
+        return isDeviceLocked(UserHandle.myUserId());
    }

    /**
@@ -347,7 +347,7 @@ public class KeyguardManager {
     * @return true if a PIN, pattern or password was set.
     */
    public boolean isDeviceSecure() {
-        return isDeviceSecure(UserHandle.getCallingUserId());
+        return isDeviceSecure(UserHandle.myUserId());
    }

    /**