Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a95459c6 authored by Ilya Matyukhin's avatar Ilya Matyukhin
Browse files

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
parent 8d931707

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

+6 −5
Original line number Diff line number Diff line
@@ -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;

        }