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

Commit ee96c179 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Set face unlock toggle to unchecked when disabled by admin" into rvc-dev am: a2d56af9 

Change-Id: I98aec73f1f08197b5bbb2a600e088fac9bf74cd7
parents 21cd235d a2d56af9

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

+5 −0
Original line number Diff line number Diff line
@@ -47,6 +47,11 @@ public class FaceSettingsLockscreenBypassPreferenceController 


    @Override

    public boolean isChecked() {

        if (!FaceSettings.isAvailable(mContext)) {

            return false;

        } else if (getRestrictingAdmin() != null) {

            return false;

        }

        int defaultValue = mContext.getResources().getBoolean(

                com.android.internal.R.bool.config_faceAuthDismissesKeyguard) ? 1 : 0;

        return Settings.Secure.getIntForUser(mContext.getContentResolver(),

tests/robotests/src/com/android/settings/biometrics/face/FaceSettingsLockscreenBypassPreferenceControllerTest.java

+1 −0
Original line number Diff line number Diff line
@@ -93,6 +93,7 @@ public class FaceSettingsLockscreenBypassPreferenceControllerTest { 
        boolean state = Settings.Secure.getInt(mContext.getContentResolver(),

                Settings.Secure.FACE_UNLOCK_DISMISSES_KEYGUARD, defaultValue ? 1 : 0) != 0;



        assertThat(mController.isChecked()).isFalse();

        assertThat(mController.onPreferenceChange(mPreference, !state)).isTrue();

        boolean newState = Settings.Secure.getInt(mContext.getContentResolver(),

                Settings.Secure.FACE_UNLOCK_DISMISSES_KEYGUARD, 0) != 0;