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

Fingerprint Unlock doesn't handle feature flag

Browse Source 
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
This commit is contained in:
Milton Wu
2022-11-18 16:32:27 +08:00
parent d30577a129
commit 0a7fce7bb7
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/com/android/settings/biometrics/fingerprint/FingerprintStatusUtils.java
View File

@@ -16,13 +16,17 @@
package com.android.settings.biometrics.fingerprint; package com.android.settings.biometrics.fingerprint;
import static android.util.FeatureFlagUtils.SETTINGS_BIOMETRICS2_ENROLLMENT;
import android.content.Context; import android.content.Context;
import android.hardware.biometrics.BiometricAuthenticator; import android.hardware.biometrics.BiometricAuthenticator;
import android.hardware.fingerprint.FingerprintManager; import android.hardware.fingerprint.FingerprintManager;
import android.util.FeatureFlagUtils;
import com.android.settings.R; import com.android.settings.R;
import com.android.settings.Utils; import com.android.settings.Utils;
import com.android.settings.biometrics.ParentalControlsUtils; import com.android.settings.biometrics.ParentalControlsUtils;
import com.android.settings.biometrics2.ui.view.FingerprintEnrollmentActivity;
import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin; import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
/** /**
@@ -79,7 +83,9 @@ public class FingerprintStatusUtils {
*/ */
public String getSettingsClassName() { public String getSettingsClassName() {
return !hasEnrolled() && isAvailable() return !hasEnrolled() && isAvailable()
? FingerprintEnrollIntroductionInternal.class.getName() ? (FeatureFlagUtils.isEnabled(mContext, SETTINGS_BIOMETRICS2_ENROLLMENT)
? FingerprintEnrollmentActivity.class.getName()
: FingerprintEnrollIntroductionInternal.class.getName())
: FingerprintSettings.class.getName(); : FingerprintSettings.class.getName();
} }