From 0a7fce7bb78ad1fcdec7d7b05b52db1c44aaaac8 Mon Sep 17 00:00:00 2001 From: Milton Wu Date: Fri, 18 Nov 2022 16:32:27 +0800 Subject: [PATCH] Fingerprint Unlock doesn't handle feature flag When user click `Fingerprint Unlock`, FingerprintStatusUtils shall also check feature flag of SETTINGS_BIOMETRICS2_ENROLLMENT to determine final class name Bug: 259639962 Test: manully enable flag and test activity Change-Id: I421dc8325ff2a28386081645318488a5e291e7f4 --- .../biometrics/fingerprint/FingerprintStatusUtils.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/com/android/settings/biometrics/fingerprint/FingerprintStatusUtils.java b/src/com/android/settings/biometrics/fingerprint/FingerprintStatusUtils.java index 18db774214c..32b83004c74 100644 --- a/src/com/android/settings/biometrics/fingerprint/FingerprintStatusUtils.java +++ b/src/com/android/settings/biometrics/fingerprint/FingerprintStatusUtils.java @@ -16,13 +16,17 @@ package com.android.settings.biometrics.fingerprint; +import static android.util.FeatureFlagUtils.SETTINGS_BIOMETRICS2_ENROLLMENT; + import android.content.Context; import android.hardware.biometrics.BiometricAuthenticator; import android.hardware.fingerprint.FingerprintManager; +import android.util.FeatureFlagUtils; import com.android.settings.R; import com.android.settings.Utils; import com.android.settings.biometrics.ParentalControlsUtils; +import com.android.settings.biometrics2.ui.view.FingerprintEnrollmentActivity; import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin; /** @@ -79,7 +83,9 @@ public class FingerprintStatusUtils { */ public String getSettingsClassName() { return !hasEnrolled() && isAvailable() - ? FingerprintEnrollIntroductionInternal.class.getName() + ? (FeatureFlagUtils.isEnabled(mContext, SETTINGS_BIOMETRICS2_ENROLLMENT) + ? FingerprintEnrollmentActivity.class.getName() + : FingerprintEnrollIntroductionInternal.class.getName()) : FingerprintSettings.class.getName(); }