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

Commit 4d3f2f86 authored by Kshitij's avatar Kshitij Committed by Nishith Khanna
Browse files

fix!: Settings: Give SfpsEnrollmentFeatureImpl a context

parent 3684d4da

src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrolling.java

+1 −1
Original line number Diff line number Diff line
@@ -256,7 +256,7 @@ public class FingerprintEnrollEnrolling extends BiometricsEnrollEnrolling { 
            setDescriptionText(R.string.security_settings_udfps_enroll_start_message);

        } else if (mCanAssumeSfps) {

            mSfpsEnrollmentFeature = FeatureFactory.getFeatureFactory()

                    .getFingerprintFeatureProvider().getSfpsEnrollmentFeature();

                    .getFingerprintFeatureProvider().getSfpsEnrollmentFeature(getApplicationContext());

            setContentView(R.layout.sfps_enroll_enrolling);

            setHelpAnimation();

        } else {

src/com/android/settings/biometrics/fingerprint/FingerprintFeatureProvider.java

+1 −1
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ public interface FingerprintFeatureProvider { 
     * Gets the feature implementation of SFPS enrollment.

     * @return the feature implementation

     */

    SfpsEnrollmentFeature getSfpsEnrollmentFeature();

    SfpsEnrollmentFeature getSfpsEnrollmentFeature(@NonNull Context context);



    /**

     * Gets calibrator for udfps pre-enroll

src/com/android/settings/biometrics/fingerprint/FingerprintFeatureProviderImpl.java

+2 −2
Original line number Diff line number Diff line
@@ -35,9 +35,9 @@ public class FingerprintFeatureProviderImpl implements FingerprintFeatureProvide 
    private SfpsRestToUnlockFeature mSfpsRestToUnlockFeature = null;



    @Override

    public SfpsEnrollmentFeature getSfpsEnrollmentFeature() {

    public SfpsEnrollmentFeature getSfpsEnrollmentFeature(@NonNull Context context) {

        if (mSfpsEnrollmentFeatureImpl == null) {

            mSfpsEnrollmentFeatureImpl = new SfpsEnrollmentFeatureImpl();

            mSfpsEnrollmentFeatureImpl = new SfpsEnrollmentFeatureImpl(context);

        }

        return mSfpsEnrollmentFeatureImpl;

    }

src/com/android/settings/biometrics/fingerprint/feature/SfpsEnrollmentFeatureImpl.java

+6 −1
Original line number Diff line number Diff line
@@ -50,6 +50,11 @@ public class SfpsEnrollmentFeatureImpl implements SfpsEnrollmentFeature { 
    private FingerprintManager mFingerprintManager = null;



    private static final int HELP_RESUME_ENROLL_MSG = 1000;

    private Context mContext;



    public SfpsEnrollmentFeatureImpl(Context context) {

	this.mContext = context;

    }



    @Override

    public int getCurrentSfpsEnrollStage(int progressSteps, Function<Integer, Integer> mapper) {
@@ -111,7 +116,7 @@ public class SfpsEnrollmentFeatureImpl implements SfpsEnrollmentFeature { 
    }



    private void resumeEnrollmentIfNecessary(int helpMsgId, String helpString, Supplier supplier) {

        final boolean useGoogleSfps = getResources().getBoolean(

        final boolean useGoogleSfps = mContext.getResources().getBoolean(

                R.bool.config_use_google_side_fps);

        if (helpMsgId == HELP_RESUME_ENROLL_MSG && useGoogleSfps) {

            SfpsUtils.resumeEnroll();