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

Commit b5bf28f6 authored by Joshua Mccloskey's avatar Joshua Mccloskey Committed by Android (Google) Code Review
Browse files

Merge "Added flag to biometric environment" into main

parents 03e91888 4a2a3c12

src/com/android/settings/SettingsApplication.java

+5 −2
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ import com.android.settings.activityembedding.ActivityEmbeddingUtils; 
import com.android.settings.biometrics.fingerprint2.BiometricsEnvironment;

import com.android.settings.core.instrumentation.ElapsedTimeUtils;

import com.android.settings.development.DeveloperOptionsActivityLifecycle;

import com.android.settings.flags.Flags;

import com.android.settings.fuelgauge.BatterySettingsStorage;

import com.android.settings.homepage.SettingsHomepageActivity;

import com.android.settings.localepicker.LocaleNotificationDataManager;
@@ -49,7 +50,7 @@ import java.lang.ref.WeakReference; 
public class SettingsApplication extends Application {



    private WeakReference<SettingsHomepageActivity> mHomeActivity = new WeakReference<>(null);

    private BiometricsEnvironment mBiometricsEnvironment;

    @Nullable private BiometricsEnvironment mBiometricsEnvironment;



    @Override

    protected void attachBaseContext(Context base) {
@@ -73,7 +74,9 @@ public class SettingsApplication extends Application { 


        // Set Spa environment.

        setSpaEnvironment();

        if (Flags.fingerprintV2Enrollment()) {

            mBiometricsEnvironment = new BiometricsEnvironment(this);

        }



        if (ActivityEmbeddingUtils.isSettingsSplitEnabled(this)

                && FeatureFlagUtils.isEnabled(this,