commit 51ac1a881ebefa31b300671a293a54c361d3d91e
author Ilya Matyukhin <ilyamaty@google.com> Fri Sep 13 02:34:52 2019 -0700
committer android-build-merger <android-build-merger@google.com> Fri Sep 13 02:34:52 2019 -0700
tree c650408e5377a266230eb4697876765a716d5944
parent ea1af11a8034846ca16db6bc2f57797299d38b31
parent 4dfe3567978f030aaac8a9bc259954f9321404cf

Merge "Fix "skip lock screen" not working for a secondary user" into qt-qpr1-dev am: 3df43a3eae
am: 4dfe356797

Change-Id: Id0fe0d8c491a76bed3108c59acf3bb7d7179101c

src/com/android/settings/biometrics/face/FaceSettingsLockscreenBypassPreferenceController.java

diff --git a/src/com/android/settings/biometrics/face/FaceSettingsLockscreenBypassPreferenceController.java b/src/com/android/settings/biometrics/face/FaceSettingsLockscreenBypassPreferenceController.java
index 15fab26..e717cb2 100644
--- a/src/com/android/settings/biometrics/face/FaceSettingsLockscreenBypassPreferenceController.java
+++ b/src/com/android/settings/biometrics/face/FaceSettingsLockscreenBypassPreferenceController.java
@@ -47,10 +47,10 @@
 
     @Override
     public boolean isChecked() {
-        boolean defaultValue = mContext.getResources().getBoolean(
-                com.android.internal.R.bool.config_faceAuthDismissesKeyguard);
-        return Settings.Secure.getInt(mContext.getContentResolver(),
-                Settings.Secure.FACE_UNLOCK_DISMISSES_KEYGUARD, defaultValue ? 1 : 0) != 0;
+        int defaultValue = mContext.getResources().getBoolean(
+                com.android.internal.R.bool.config_faceAuthDismissesKeyguard) ? 1 : 0;
+        return Settings.Secure.getIntForUser(mContext.getContentResolver(),
+                Settings.Secure.FACE_UNLOCK_DISMISSES_KEYGUARD, defaultValue, getUserId()) != 0;
     }
 
     @Override
@@ -81,7 +81,8 @@
         }
 
         if (mFaceManager != null && mFaceManager.isHardwareDetected()) {
-            return mFaceManager.hasEnrolledTemplates() ? AVAILABLE : DISABLED_DEPENDENT_SETTING;
+            return mFaceManager.hasEnrolledTemplates(getUserId())
+                    ? AVAILABLE : DISABLED_DEPENDENT_SETTING;
         } else {
             return UNSUPPORTED_ON_DEVICE;
         }