diff --git a/src/com/android/settings/biometrics/face/FaceUpdater.java b/src/com/android/settings/biometrics/face/FaceUpdater.java index 3a1f77c4352..57c11953d6a 100644 --- a/src/com/android/settings/biometrics/face/FaceUpdater.java +++ b/src/com/android/settings/biometrics/face/FaceUpdater.java @@ -50,8 +50,9 @@ public class FaceUpdater { /** Wrapper around the {@link FaceManager#enroll} method. */ public void enroll(int userId, byte[] hardwareAuthToken, CancellationSignal cancel, FaceManager.EnrollmentCallback callback, int[] disabledFeatures) { - mFaceManager.enroll(userId, hardwareAuthToken, cancel, - new NotifyingEnrollmentCallback(mContext, callback), disabledFeatures); + this.enroll(userId, hardwareAuthToken, cancel, + new NotifyingEnrollmentCallback(mContext, callback), disabledFeatures, + null, false); } /** Wrapper around the {@link FaceManager#enroll} method. */ diff --git a/tests/unit/src/com/android/settings/biometrics/face/FaceUpdaterTest.java b/tests/unit/src/com/android/settings/biometrics/face/FaceUpdaterTest.java index 66514ac5068..9190d0a5b82 100644 --- a/tests/unit/src/com/android/settings/biometrics/face/FaceUpdaterTest.java +++ b/tests/unit/src/com/android/settings/biometrics/face/FaceUpdaterTest.java @@ -39,7 +39,6 @@ import androidx.test.ext.junit.runners.AndroidJUnit4; import com.android.settings.safetycenter.SafetyCenterManagerWrapper; import org.junit.Before; -import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.ArgumentCaptor; @@ -100,7 +99,9 @@ public class FaceUpdaterTest { same(HARDWARE_AUTH_TOKEN), same(CANCELLATION_SIGNAL), callbackCaptor.capture(), - same(DISABLED_FEATURES)); + same(DISABLED_FEATURES), + same(null), + eq(false)); FaceManager.EnrollmentCallback callback = callbackCaptor.getValue(); callback.onEnrollmentError(ERR_MSG_ID, ERR_STRING); @@ -126,12 +127,14 @@ public class FaceUpdaterTest { same(HARDWARE_AUTH_TOKEN), same(CANCELLATION_SIGNAL), callbackCaptor.capture(), - same(DISABLED_FEATURES)); + same(DISABLED_FEATURES), + same(null), + eq(false)); FaceManager.EnrollmentCallback callback = callbackCaptor.getValue(); callback.onEnrollmentProgress(/* remaining= */ 0); - verify(mSafetyCenterManagerWrapper).isEnabled(mContext); + verify(mSafetyCenterManagerWrapper, atLeast(1)).isEnabled(mContext); } @Test @@ -145,7 +148,9 @@ public class FaceUpdaterTest { same(HARDWARE_AUTH_TOKEN), same(CANCELLATION_SIGNAL), callbackCaptor.capture(), - same(DISABLED_FEATURES)); + same(DISABLED_FEATURES), + same(null), + eq(false)); FaceManager.EnrollmentCallback callback = callbackCaptor.getValue(); callback.onEnrollmentProgress(/* remaining= */ 1); @@ -153,7 +158,6 @@ public class FaceUpdaterTest { verify(mSafetyCenterManagerWrapper, never()).isEnabled(any()); } - @Ignore("b/282413778") @Test public void enroll_secondVersion_onEnrollmentCallbacks_triggerGivenCallback() { ArgumentCaptor callbackCaptor = @@ -182,7 +186,6 @@ public class FaceUpdaterTest { .onEnrollmentFrame(HELP_CODE, HELP_MESSAGE, CELL, STAGE, PAN, TILT, DISTANCE); } - @Ignore("b/282413778") @Test public void enroll_secondVersion_onEnrollmentSuccess_invokedInteractionWithSafetyCenter() { ArgumentCaptor callbackCaptor = @@ -204,7 +207,6 @@ public class FaceUpdaterTest { verify(mSafetyCenterManagerWrapper).isEnabled(mContext); } - @Ignore("b/282413778") @Test public void enroll_secondVersion_onEnrollmentNotYetFinished_didntInvokeInteractionWithSafetyCenter() { ArgumentCaptor callbackCaptor =