Merge "Revert "Implement sfps enroll improvement feature with feature provider"" into main

tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrollingTest.java

@@ -53,9 +53,6 @@ import android.hardware.fingerprint.FingerprintSensorPropertiesInternal;
 import android.os.Bundle;
 import android.os.CancellationSignal;
 import android.os.Vibrator;
-import android.platform.test.annotations.RequiresFlagsDisabled;
-import android.platform.test.flag.junit.CheckFlagsRule;
-import android.platform.test.flag.junit.DeviceFlagsValueProvider;
 import android.view.Display;
 import android.view.Surface;
 import android.view.View;
@@ -65,9 +62,6 @@ import android.widget.ImageView;
 import android.widget.TextView;
 
 import com.android.settings.R;
-import com.android.settings.biometrics.fingerprint.feature.SfpsEnrollmentFeatureImpl;
-import com.android.settings.flags.Flags;
-import com.android.settings.overlay.FeatureFactory;
 import com.android.settings.testutils.FakeFeatureFactory;
 import com.android.settings.widget.RingProgressBar;
 
@@ -77,7 +71,6 @@ import com.google.android.setupdesign.GlifLayout;
 
 import org.junit.Before;
 import org.junit.Ignore;
-import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.ArgumentCaptor;
@@ -100,8 +93,6 @@ public class FingerprintEnrollEnrollingTest {
     private static final String ENROLL_PROGRESS_COLOR_LIGHT = "#699FF3";
     private static final String ENROLL_PROGRESS_COLOR_DARK = "#7DA7F1";
 
-    @Rule
-    public final CheckFlagsRule mCheckFlagsRule = DeviceFlagsValueProvider.createCheckFlagsRule();
 
     @Mock private FingerprintManager mFingerprintManager;
 
@@ -603,23 +594,6 @@ public class FingerprintEnrollEnrollingTest {
         assertThat(getLayout().getDescriptionTextView().getVisibility()).isEqualTo(View.GONE);
     }
 
-    @Test
-    @RequiresFlagsDisabled(Flags.FLAG_SFPS_ENROLL_REFINEMENT)
-    public void testFingerprintFeatureProvider_impl() {
-        // We should always get default implementation when the flag is disabled.
-        assertThat(FeatureFactory.getFeatureFactory().getFingerprintFeatureProvider())
-                .isInstanceOf(FingerprintFeatureProviderImpl.class);
-    }
-
-    @Test
-    @RequiresFlagsDisabled(Flags.FLAG_SFPS_ENROLL_REFINEMENT)
-    public void testFingerprintFeatureProvider_sfpsEnrollmentFeatureImpl() {
-        // We should always get default implementation when the flag is disabled.
-        assertThat(FeatureFactory.getFeatureFactory()
-                .getFingerprintFeatureProvider().getSfpsEnrollmentFeature())
-                .isInstanceOf(SfpsEnrollmentFeatureImpl.class);
-    }
-
     private GlifLayout getLayout() {
         return (GlifLayout) mActivity.findViewById(R.id.setup_wizard_layout);
     }

tests/robotests/testutils/com/android/settings/testutils/FakeFeatureFactory.java

@@ -24,7 +24,6 @@ import com.android.settings.accessibility.AccessibilitySearchFeatureProvider;
 import com.android.settings.accounts.AccountFeatureProvider;
 import com.android.settings.applications.ApplicationFeatureProvider;
 import com.android.settings.biometrics.face.FaceFeatureProvider;
-import com.android.settings.biometrics.fingerprint.FingerprintFeatureProvider;
 import com.android.settings.biometrics2.factory.BiometricsRepositoryProvider;
 import com.android.settings.bluetooth.BluetoothFeatureProvider;
 import com.android.settings.connecteddevice.fastpair.FastPairFeatureProvider;
@@ -81,7 +80,6 @@ public class FakeFeatureFactory extends FeatureFactory {
     public final AccountFeatureProvider mAccountFeatureProvider;
     public final BluetoothFeatureProvider mBluetoothFeatureProvider;
     public final FaceFeatureProvider mFaceFeatureProvider;
-    public final FingerprintFeatureProvider mFingerprintFeatureProvider;
     public final BiometricsRepositoryProvider mBiometricsRepositoryProvider;
 
     public PanelFeatureProvider panelFeatureProvider;
@@ -134,7 +132,6 @@ public class FakeFeatureFactory extends FeatureFactory {
         panelFeatureProvider = mock(PanelFeatureProvider.class);
         mBluetoothFeatureProvider = mock(BluetoothFeatureProvider.class);
         mFaceFeatureProvider = mock(FaceFeatureProvider.class);
-        mFingerprintFeatureProvider = mock(FingerprintFeatureProvider.class);
         mBiometricsRepositoryProvider = mock(BiometricsRepositoryProvider.class);
         wifiTrackerLibProvider = mock(WifiTrackerLibProvider.class);
         securitySettingsFeatureProvider = mock(SecuritySettingsFeatureProvider.class);
@@ -259,11 +256,6 @@ public class FakeFeatureFactory extends FeatureFactory {
         return mFaceFeatureProvider;
     }
 
-    @Override
-    public FingerprintFeatureProvider getFingerprintFeatureProvider() {
-        return mFingerprintFeatureProvider;
-    }
-
     @Override
     public BiometricsRepositoryProvider getBiometricsRepositoryProvider() {
         return mBiometricsRepositoryProvider;