From a95459c6409e00565574f5d8363d78ea83d5c700 Mon Sep 17 00:00:00 2001 From: Ilya Matyukhin Date: Wed, 11 Sep 2019 13:58:12 -0700 Subject: [PATCH] Fix "skip lock screen" not working for a secondary user Bug: 140878309 Test: "Skip lock screen" is no longer grayed-out for a secondary user Change-Id: I3aab6582bee07760b671034b0971c98b1c946a1c --- .../FaceSettingsLockscreenBypassPreferenceController.java | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/com/android/settings/biometrics/face/FaceSettingsLockscreenBypassPreferenceController.java b/src/com/android/settings/biometrics/face/FaceSettingsLockscreenBypassPreferenceController.java index 15fab260dc..e717cb2008 100644 --- a/src/com/android/settings/biometrics/face/FaceSettingsLockscreenBypassPreferenceController.java +++ b/src/com/android/settings/biometrics/face/FaceSettingsLockscreenBypassPreferenceController.java @@ -47,10 +47,10 @@ public class FaceSettingsLockscreenBypassPreferenceController @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 @@ public class FaceSettingsLockscreenBypassPreferenceController } 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; } -- 2.11.0