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

Apply feature flag for biometrics

Browse Source 
adb shell setprop sys.fflag.override.settings_biometrics2_enrollment true

Bug: 236072782
Test: Manully enable feature flag and test
Change-Id: Id794ba117d3ae9e0bc76086ee8c1cd95fa607cc1
This commit is contained in:
Milton Wu
2022-09-21 09:14:42 +08:00
parent b9b8b8a512
commit ee5ebfa18f
2 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/com/android/settings/biometrics/BiometricUtils.java
View File

@@ -27,6 +27,7 @@ import android.hardware.face.FaceManager;
import android.hardware.face.FaceSensorPropertiesInternal;
import android.os.Bundle;
import android.os.storage.StorageManager;
import android.util.FeatureFlagUtils;
import android.util.Log;
import android.view.Surface;
@@ -41,6 +42,7 @@ import com.android.settings.biometrics.face.FaceEnrollIntroduction;
import com.android.settings.biometrics.fingerprint.FingerprintEnrollFindSensor;
import com.android.settings.biometrics.fingerprint.FingerprintEnrollIntroduction;
import com.android.settings.biometrics.fingerprint.SetupFingerprintEnrollIntroduction;
import com.android.settings.biometrics2.ui.view.FingerprintEnrollmentActivity;
import com.android.settings.password.ChooseLockGeneric;
import com.android.settings.password.ChooseLockSettingsHelper;
import com.android.settings.password.SetupChooseLockGeneric;
@@ -190,7 +192,13 @@ public class BiometricUtils {
*/
public static Intent getFingerprintIntroIntent(@NonNull Context context,
@NonNull Intent activityIntent) {
if (WizardManagerHelper.isAnySetupWizard(activityIntent)) {
if (FeatureFlagUtils.isEnabled(context, FeatureFlagUtils.SETTINGS_BIOMETRICS2_ENROLLMENT)) {
final Intent intent = new Intent(context, FingerprintEnrollmentActivity.class);
if (WizardManagerHelper.isAnySetupWizard(activityIntent)) {
WizardManagerHelper.copyWizardManagerExtras(activityIntent, intent);
}
return intent;
} else if (WizardManagerHelper.isAnySetupWizard(activityIntent)) {
Intent intent = new Intent(context, SetupFingerprintEnrollIntroduction.class);
WizardManagerHelper.copyWizardManagerExtras(activityIntent, intent);
return intent;