From b6a01a03ddcf39bb6bc57194924aa77692cf9533 Mon Sep 17 00:00:00 2001
From: Shawn Lin <shawnlin@google.com>
Date: Mon, 20 Jan 2025 10:15:36 +0000
Subject: [PATCH] Fixed test failed on aosp

There is no mock for
FaceFeatureProvider.getEnrollActivityClassProvider() in aosp which
caused the null exception test failure.

Use FaceEnroll class name to lauch enroll activity directly to fix this
issue.

Bug: 388933801
Test: atest FaceSettingsEnrollButtonPreferenceControlleTest
Flag: com.android.settings.flags.biometrics_onboarding_education
Change-Id: Ibbbbe888f95c1ece0372ac31435ce6817cba45b5
---
 .../face/FaceSettingsEnrollButtonPreferenceController.java  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/com/android/settings/biometrics/face/FaceSettingsEnrollButtonPreferenceController.java b/src/com/android/settings/biometrics/face/FaceSettingsEnrollButtonPreferenceController.java
index e7badded405..738f92f0c88 100644
--- a/src/com/android/settings/biometrics/face/FaceSettingsEnrollButtonPreferenceController.java
+++ b/src/com/android/settings/biometrics/face/FaceSettingsEnrollButtonPreferenceController.java
@@ -16,6 +16,8 @@
 
 package com.android.settings.biometrics.face;
 
+import static com.android.settings.Utils.SETTINGS_PACKAGE_NAME;
+
 import android.app.admin.DevicePolicyManager;
 import android.content.Context;
 import android.content.Intent;
@@ -26,7 +28,6 @@ import androidx.preference.Preference;
 
 import com.android.settings.R;
 import com.android.settings.core.BasePreferenceController;
-import com.android.settings.overlay.FeatureFactory;
 import com.android.settings.password.ChooseLockSettingsHelper;
 import com.android.settingslib.RestrictedLockUtilsInternal;
 import com.android.settingslib.widget.LayoutPreference;
@@ -82,8 +83,7 @@ public class FaceSettingsEnrollButtonPreferenceController extends BasePreference
     public void onClick(View v) {
         mIsClicked = true;
         final Intent intent = new Intent();
-        intent.setClass(mContext, FeatureFactory.getFeatureFactory().getFaceFeatureProvider()
-                .getEnrollActivityClassProvider().getNext());
+        intent.setClassName(SETTINGS_PACKAGE_NAME, FaceEnroll.class.getName());
         intent.putExtra(Intent.EXTRA_USER_ID, mUserId);
         intent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE_TOKEN, mToken);
         if (mListener != null) {