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

Commit 0a7fce7b authored by Milton Wu's avatar Milton Wu
Browse files

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
parent d30577a1

src/com/android/settings/biometrics/fingerprint/FingerprintStatusUtils.java

+7 −1
Original line number Diff line number Diff line
@@ -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();

    }