Merge "Fix biometric tests that relied on a non-zero error reset delay." into sc-dev am: 72104bdf67

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14705316

Change-Id: Iee009640d30b829631ea93a377f561c90b42439e
This commit is contained in:
Joe Bolinger
2021-05-25 04:49:56 +00:00
committed by Automerger Merge Worker

View File

@@ -26,6 +26,7 @@ import static org.mockito.Mockito.never;
import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verify;
import android.content.Context; import android.content.Context;
import android.hardware.biometrics.BiometricPrompt;
import android.hardware.biometrics.PromptInfo; import android.hardware.biometrics.PromptInfo;
import android.os.Bundle; import android.os.Bundle;
import android.test.suitebuilder.annotation.SmallTest; import android.test.suitebuilder.annotation.SmallTest;
@@ -202,7 +203,7 @@ public class AuthBiometricViewTest extends SysuiTestCase {
waitForIdleSync(); waitForIdleSync();
verify(mCallback).onAction(AuthBiometricView.Callback.ACTION_ERROR); verify(mCallback).onAction(AuthBiometricView.Callback.ACTION_ERROR);
assertEquals(AuthBiometricView.STATE_ERROR, mBiometricView.mState); assertEquals(AuthBiometricView.STATE_IDLE, mBiometricView.mState);
} }
@Test @Test
@@ -253,6 +254,12 @@ public class AuthBiometricViewTest extends SysuiTestCase {
public TextView getIndicatorView() { public TextView getIndicatorView() {
return indicatorView; return indicatorView;
} }
@Override
public int getDelayAfterError() {
// keep a real delay to test saving in the error state
return BiometricPrompt.HIDE_DIALOG_DELAY;
}
}); });
final String failureMessage = "testFailureMessage"; final String failureMessage = "testFailureMessage";