Merge "Fixed test failed on aosp" into main

This commit is contained in:
Shawn Lin
2025-01-20 23:06:31 -08:00
committed by Android (Google) Code Review

View File

@@ -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) {