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

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

Merge "Prevent duplicate lock confirmation in face & fingerprint settings." into sc-dev

parents ed23483c eb5fd6ec

src/com/android/settings/biometrics/combination/BiometricsSettingsBase.java

+7 −0
Original line number Diff line number Diff line
@@ -122,7 +122,10 @@ public abstract class BiometricsSettingsBase extends DashboardFragment { 
                extras.putByteArray(ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE_TOKEN, token);

                extras.putInt(BiometricEnrollBase.EXTRA_KEY_SENSOR_ID, sensorId);

                extras.putLong(BiometricEnrollBase.EXTRA_KEY_CHALLENGE, challenge);

                super.onPreferenceTreeClick(preference);

            });



            return true;

        } else if (getFingerprintPreferenceKey().equals(key)) {

            mDoNotFinishActivity = true;

            mFingerprintManager.generateChallenge(mUserId, (sensorId, userId, challenge) -> {
@@ -131,8 +134,12 @@ public abstract class BiometricsSettingsBase extends DashboardFragment { 
                final Bundle extras = preference.getExtras();

                extras.putByteArray(ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE_TOKEN, token);

                extras.putLong(BiometricEnrollBase.EXTRA_KEY_CHALLENGE, challenge);

                super.onPreferenceTreeClick(preference);

            });



            return true;

        }



        return super.onPreferenceTreeClick(preference);

    }