packages/apps/Settings
| Revision | a95459c6409e00565574f5d8363d78ea83d5c700 (tree) |
|---|---|
| Zeit | 2019-09-13 18:10:15 |
| Autor | Ilya Matyukhin <ilyamaty@goog...> |
| Commiter | Ilya Matyukhin |
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
src/com/android/settings/biometrics/face/FaceSettingsLockscreenBypassPreferenceController.java (diff)| @@ -47,10 +47,10 @@ public class FaceSettingsLockscreenBypassPreferenceController | ||
| 47 | 47 | |
| 48 | 48 | @Override |
| 49 | 49 | public boolean isChecked() { |
| 50 | - boolean defaultValue = mContext.getResources().getBoolean( | |
| 51 | - com.android.internal.R.bool.config_faceAuthDismissesKeyguard); | |
| 52 | - return Settings.Secure.getInt(mContext.getContentResolver(), | |
| 53 | - Settings.Secure.FACE_UNLOCK_DISMISSES_KEYGUARD, defaultValue ? 1 : 0) != 0; | |
| 50 | + int defaultValue = mContext.getResources().getBoolean( | |
| 51 | + com.android.internal.R.bool.config_faceAuthDismissesKeyguard) ? 1 : 0; | |
| 52 | + return Settings.Secure.getIntForUser(mContext.getContentResolver(), | |
| 53 | + Settings.Secure.FACE_UNLOCK_DISMISSES_KEYGUARD, defaultValue, getUserId()) != 0; | |
| 54 | 54 | } |
| 55 | 55 | |
| 56 | 56 | @Override |
| @@ -81,7 +81,8 @@ public class FaceSettingsLockscreenBypassPreferenceController | ||
| 81 | 81 | } |
| 82 | 82 | |
| 83 | 83 | if (mFaceManager != null && mFaceManager.isHardwareDetected()) { |
| 84 | - return mFaceManager.hasEnrolledTemplates() ? AVAILABLE : DISABLED_DEPENDENT_SETTING; | |
| 84 | + return mFaceManager.hasEnrolledTemplates(getUserId()) | |
| 85 | + ? AVAILABLE : DISABLED_DEPENDENT_SETTING; | |
| 85 | 86 | } else { |
| 86 | 87 | return UNSUPPORTED_ON_DEVICE; |
| 87 | 88 | } |
Fork