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

Commit 1de3feb0 authored by Ilya Matyukhin's avatar Ilya Matyukhin
Browse files

Fix "Skip lock screen" not working for secondary user 

Bug: 140878309
Test: the option is not grayed out for secondary user.
Change-Id: I2413aa3c634e89a90d104e9ad60df15e49c75ed2
(cherry picked from commit e17caeea)
parent 1284d9de

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

+4 −0
Original line number Diff line number Diff line
@@ -142,6 +142,8 @@ public class FaceSettings extends DashboardFragment { 
                ((FaceSettingsPreferenceController) controller).setUserId(mUserId);

            } else if (controller instanceof FaceSettingsEnrollButtonPreferenceController) {

                ((FaceSettingsEnrollButtonPreferenceController) controller).setUserId(mUserId);

            } else if (controller instanceof FaceSettingsLockscreenBypassPreferenceController) {

                ((FaceSettingsLockscreenBypassPreferenceController) controller).setUserId(mUserId);

            }

        }

        mRemoveController.setUserId(mUserId);
@@ -149,6 +151,7 @@ public class FaceSettings extends DashboardFragment { 
        // Don't show keyguard controller for work profile settings.

        if (mUserManager.isManagedProfile(mUserId)) {

            removePreference(FaceSettingsKeyguardPreferenceController.KEY);

            removePreference(FaceSettingsLockscreenBypassPreferenceController.KEY);

        }



        if (savedInstanceState != null) {
@@ -260,6 +263,7 @@ public class FaceSettings extends DashboardFragment { 
        final List<AbstractPreferenceController> controllers = new ArrayList<>();

        controllers.add(new FaceSettingsVideoPreferenceController(context));

        controllers.add(new FaceSettingsKeyguardPreferenceController(context));

        controllers.add(new FaceSettingsLockscreenBypassPreferenceController(context));

        controllers.add(new FaceSettingsAppPreferenceController(context));

        controllers.add(new FaceSettingsAttentionPreferenceController(context));

        controllers.add(new FaceSettingsRemoveButtonPreferenceController(context));

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

+4 −0
Original line number Diff line number Diff line
@@ -36,6 +36,10 @@ public class FaceSettingsLockscreenBypassPreferenceController 
    protected FaceManager mFaceManager;

    private UserManager mUserManager;



    public FaceSettingsLockscreenBypassPreferenceController(Context context) {

        this(context, KEY);

    }



    public FaceSettingsLockscreenBypassPreferenceController(Context context, String preferenceKey) {

        super(context, preferenceKey);

        if (context.getPackageManager().hasSystemFeature(PackageManager.FEATURE_FACE)) {