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

Commit c5df3daa authored by Steven Ross's avatar Steven Ross Committed by Android (Google) Code Review
Browse files

Merge "calling back SetupFaceLock to clean up temporary gallery"

parents b40e4491 c620ba41

src/com/android/settings/ChooseLockGeneric.java

+4 −1
Original line number Diff line number Diff line
@@ -308,6 +308,8 @@ public class ChooseLockGeneric extends PreferenceActivity { 
                .getBooleanExtra(LockPatternUtils.LOCKSCREEN_BIOMETRIC_WEAK_FALLBACK, false);



            quality = upgradeQuality(quality);



            LockPatternUtils.setLastAttemptWasBiometric(false);

            if (quality >= DevicePolicyManager.PASSWORD_QUALITY_NUMERIC) {

                int minLength = mDPM.getPasswordMinimumLength(null);

                if (minLength < MIN_PASSWORD_LENGTH) {
@@ -336,10 +338,11 @@ public class ChooseLockGeneric extends PreferenceActivity { 
                        isFallback);

                startActivity(intent);

            } else if (quality == DevicePolicyManager.PASSWORD_QUALITY_BIOMETRIC_WEAK) {

                LockPatternUtils.setLastAttemptWasBiometric(true);

                Intent intent = getBiometricSensorIntent(quality);

                startActivity(intent);

            } else if (quality == DevicePolicyManager.PASSWORD_QUALITY_UNSPECIFIED) {

                mChooseLockSettingsHelper.utils().clearLock();

                mChooseLockSettingsHelper.utils().clearLock(false);

                mChooseLockSettingsHelper.utils().setLockScreenDisabled(disabled);

                getActivity().setResult(Activity.RESULT_OK);

            }

src/com/android/settings/ChooseLockPassword.java

+1 −1
Original line number Diff line number Diff line
@@ -367,9 +367,9 @@ public class ChooseLockPassword extends PreferenceActivity { 
                }

            } else if (mUiStage == Stage.NeedToConfirm) {

                if (mFirstPin.equals(pin)) {

                    mLockPatternUtils.clearLock();

                    final boolean isFallback = getActivity().getIntent().getBooleanExtra(

                            LockPatternUtils.LOCKSCREEN_BIOMETRIC_WEAK_FALLBACK, false);

                    mLockPatternUtils.clearLock(isFallback);

                    mLockPatternUtils.saveLockPassword(pin, mRequestedQuality, isFallback);

                    getActivity().finish();

                } else {

src/com/android/settings/SecuritySettings.java

+1 −0
Original line number Diff line number Diff line
@@ -349,6 +349,7 @@ public class SecuritySettings extends SettingsPreferenceFragment 
    @Override

    public void onActivityResult(int requestCode, int resultCode, Intent data) {

        super.onActivityResult(requestCode, resultCode, data);

        mChooseLockSettingsHelper.utils().deleteTempGallery();

        createPreferenceHierarchy();

    }