PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Added flag to biometric environment" into main

Browse Source
This commit is contained in:
Joshua Mccloskey
2024-06-27 17:58:06 +00:00
committed by Android (Google) Code Review
parent 03e9188830 4a2a3c1279
commit b5bf28f697
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/com/android/settings/SettingsApplication.java
View File

@@ -31,6 +31,7 @@ import com.android.settings.activityembedding.ActivityEmbeddingUtils;
import com.android.settings.biometrics.fingerprint2.BiometricsEnvironment; import com.android.settings.biometrics.fingerprint2.BiometricsEnvironment;
import com.android.settings.core.instrumentation.ElapsedTimeUtils; import com.android.settings.core.instrumentation.ElapsedTimeUtils;
import com.android.settings.development.DeveloperOptionsActivityLifecycle; import com.android.settings.development.DeveloperOptionsActivityLifecycle;
import com.android.settings.flags.Flags;
import com.android.settings.fuelgauge.BatterySettingsStorage; import com.android.settings.fuelgauge.BatterySettingsStorage;
import com.android.settings.homepage.SettingsHomepageActivity; import com.android.settings.homepage.SettingsHomepageActivity;
import com.android.settings.localepicker.LocaleNotificationDataManager; import com.android.settings.localepicker.LocaleNotificationDataManager;
@@ -49,7 +50,7 @@ import java.lang.ref.WeakReference;
public class SettingsApplication extends Application { public class SettingsApplication extends Application {
private WeakReference<SettingsHomepageActivity> mHomeActivity = new WeakReference<>(null); private WeakReference<SettingsHomepageActivity> mHomeActivity = new WeakReference<>(null);
private BiometricsEnvironment mBiometricsEnvironment; @Nullable private BiometricsEnvironment mBiometricsEnvironment;
@Override @Override
protected void attachBaseContext(Context base) { protected void attachBaseContext(Context base) {
@@ -73,7 +74,9 @@ public class SettingsApplication extends Application {
// Set Spa environment. // Set Spa environment.
setSpaEnvironment(); setSpaEnvironment();
mBiometricsEnvironment = new BiometricsEnvironment(this); if (Flags.fingerprintV2Enrollment()) {
mBiometricsEnvironment = new BiometricsEnvironment(this);
}
if (ActivityEmbeddingUtils.isSettingsSplitEnabled(this) if (ActivityEmbeddingUtils.isSettingsSplitEnabled(this)
&& FeatureFlagUtils.isEnabled(this, && FeatureFlagUtils.isEnabled(this,