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

Commit 847865dc authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Update Settings to match Framework"

parents da3e0348 76d40d3e

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

+1 −1
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ public class FaceStatusPreferenceController extends BiometricStatusPreferenceCon 


    @Override

    protected boolean hasEnrolledBiometrics() {

        return mFaceManager.hasEnrolledFaces(mUserId);

        return mFaceManager.hasEnrolledTemplates(mUserId);

    }



    @Override

src/com/android/settings/password/ChooseLockGeneric.java

+1 −1
Original line number Diff line number Diff line
@@ -813,7 +813,7 @@ public class ChooseLockGeneric extends SettingsActivity { 
        // TODO: figure out how to eliminate duplicated code. It's a bit hard due to the async-ness

        private void removeAllFaceForUserAndFinish(final int userId, RemovalTracker tracker) {

            if (mFaceManager != null && mFaceManager.isHardwareDetected()) {

                if (mFaceManager.hasEnrolledFaces(userId)) {

                if (mFaceManager.hasEnrolledTemplates(userId)) {

                    mFaceManager.setActiveUser(userId);

                    Face face = new Face(null, 0, 0);

                    mFaceManager.remove(face, userId,

src/com/android/settings/password/SetNewPasswordController.java

+1 −1
Original line number Diff line number Diff line
@@ -115,7 +115,7 @@ final class SetNewPasswordController { 
        if (mPackageManager.hasSystemFeature(PackageManager.FEATURE_FACE)

                && mFaceManager != null

                && mFaceManager.isHardwareDetected()

                && !mFaceManager.hasEnrolledFaces(mTargetUserId)

                && !mFaceManager.hasEnrolledTemplates(mTargetUserId)

                && !isFaceDisabledByAdmin()) {

            extras = getFaceChooseLockExtras();

        } else if (mPackageManager.hasSystemFeature(PackageManager.FEATURE_FINGERPRINT)

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

+1 −1
Original line number Diff line number Diff line
@@ -121,7 +121,7 @@ public class FaceStatusPreferenceControllerTest { 
        when(mFaceManager.isHardwareDetected()).thenReturn(true);

        when(mFaceManager.getEnrolledFaces(anyInt()))

                .thenReturn(Collections.singletonList(mock(Face.class)));

        when(mFaceManager.hasEnrolledFaces(anyInt()))

        when(mFaceManager.hasEnrolledTemplates(anyInt()))

                .thenReturn(true);



        mController.updateState(mPreference);

tests/robotests/src/com/android/settings/password/SetNewPasswordControllerTest.java

+4 −4
Original line number Diff line number Diff line
@@ -113,7 +113,7 @@ public final class SetNewPasswordControllerTest { 
        // GIVEN the device supports face.

        when(mFaceManager.isHardwareDetected()).thenReturn(true);

        // GIVEN there are no enrolled face.

        when(mFaceManager.hasEnrolledFaces(CURRENT_USER_ID)).thenReturn(false);

        when(mFaceManager.hasEnrolledTemplates(CURRENT_USER_ID)).thenReturn(false);

        // GIVEN DPC does not disallow face for keyguard usage.

        when(mDevicePolicyManager.getKeyguardDisabledFeatures(any(ComponentName.class)))

                .thenReturn(0);
@@ -180,7 +180,7 @@ public final class SetNewPasswordControllerTest { 
        // GIVEN the device does NOT support face.

        when(mFaceManager.isHardwareDetected()).thenReturn(false);

        // GIVEN there are no enrolled face.

        when(mFaceManager.hasEnrolledFaces(CURRENT_USER_ID)).thenReturn(false);

        when(mFaceManager.hasEnrolledTemplates(CURRENT_USER_ID)).thenReturn(false);

        // GIVEN DPC does not disallow face for keyguard usage.

        when(mDevicePolicyManager.getKeyguardDisabledFeatures(any(ComponentName.class)))

                .thenReturn(0);
@@ -218,7 +218,7 @@ public final class SetNewPasswordControllerTest { 
        // GIVEN the device supports face.

        when(mFaceManager.isHardwareDetected()).thenReturn(true);

        // GIVEN there are no enrolled face.

        when(mFaceManager.hasEnrolledFaces(CURRENT_USER_ID)).thenReturn(true);

        when(mFaceManager.hasEnrolledTemplates(CURRENT_USER_ID)).thenReturn(true);

        // GIVEN DPC does not disallow face for keyguard usage.

        when(mDevicePolicyManager.getKeyguardDisabledFeatures(any(ComponentName.class)))

                .thenReturn(0);
@@ -256,7 +256,7 @@ public final class SetNewPasswordControllerTest { 
        // GIVEN the device supports face.

        when(mFaceManager.isHardwareDetected()).thenReturn(true);

        // GIVEN there is an enrolled face.

        when(mFaceManager.hasEnrolledFaces(CURRENT_USER_ID)).thenReturn(true);

        when(mFaceManager.hasEnrolledTemplates(CURRENT_USER_ID)).thenReturn(true);

        // GIVEN DPC disallows face for keyguard usage.

        when(mDevicePolicyManager.getKeyguardDisabledFeatures(any(ComponentName.class)))

                .thenReturn(DevicePolicyManager.KEYGUARD_DISABLE_FACE);