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

Commit eb5fd6ec authored by Joe Bolinger's avatar Joe Bolinger
Browse files

Prevent duplicate lock confirmation in face & fingerprint settings. 

Wait for all extras to be available before launching the next activity.

Fix: 187005993
Test: manual (open face/fp settings & verify only asked for PIN once)
Change-Id: I9e3f46d5750b11ab0773d08d44908d3e9703ca42
parent 8c1c7b63

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);

    }