Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bb34e046 authored by Joe Bolinger's avatar Joe Bolinger Committed by Automerger Merge Worker
Browse files

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

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

Change-Id: I79a23f95bb88d1c3a486c642495eec2dc7a59709
parents dec177de 72104bdf
Loading
Loading
Loading
Loading
+8 −1
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ import static org.mockito.Mockito.never;
import static org.mockito.Mockito.verify;

import android.content.Context;
import android.hardware.biometrics.BiometricPrompt;
import android.hardware.biometrics.PromptInfo;
import android.os.Bundle;
import android.test.suitebuilder.annotation.SmallTest;
@@ -202,7 +203,7 @@ public class AuthBiometricViewTest extends SysuiTestCase {
        waitForIdleSync();

        verify(mCallback).onAction(AuthBiometricView.Callback.ACTION_ERROR);
        assertEquals(AuthBiometricView.STATE_ERROR, mBiometricView.mState);
        assertEquals(AuthBiometricView.STATE_IDLE, mBiometricView.mState);
    }

    @Test
@@ -253,6 +254,12 @@ public class AuthBiometricViewTest extends SysuiTestCase {
            public TextView getIndicatorView() {
                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";