Merge "Ignore flaky biometrics tests" into tm-dev

2 files changed, 9 insertions, 0 deletions

diff --git a/tests/framework/base/biometrics/src/android/server/biometrics/BiometricActivityTests.java b/tests/framework/base/biometrics/src/android/server/biometrics/BiometricActivityTests.java
index 07d6cc8f48e..2f7339ad1b7 100644
--- a/tests/framework/base/biometrics/src/android/server/biometrics/BiometricActivityTests.java
+++ b/tests/framework/base/biometrics/src/android/server/biometrics/BiometricActivityTests.java
@@ -40,6 +40,7 @@ import android.util.Log;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
+import org.junit.Ignore;
 import org.junit.Test;
 
 /**
@@ -237,6 +238,8 @@ public class BiometricActivityTests extends BiometricTestBase {
         assertEquals(callbackState.toString(), 1, callbackState.mNumAuthRejected);
     }
 
+    // TODO(b/236763921): fix this test and unignore.
+    @Ignore
     @Test
     public void testBiometricOnly_negativeButtonInvoked() throws Exception {
         assumeTrue(Utils.isFirstApiLevel29orGreater());
@@ -285,6 +288,8 @@ public class BiometricActivityTests extends BiometricTestBase {
     }
 
 
+    // TODO(b/236763921): fix this test and unignore.
+    @Ignore
     @Test
     public void testBiometricOrCredential_credentialButtonInvoked_biometricEnrolled()
             throws Exception {
diff --git a/tests/framework/base/biometrics/src/android/server/biometrics/BiometricSimpleTests.java b/tests/framework/base/biometrics/src/android/server/biometrics/BiometricSimpleTests.java
index fd42e71cc06..30af1e78562 100644
--- a/tests/framework/base/biometrics/src/android/server/biometrics/BiometricSimpleTests.java
+++ b/tests/framework/base/biometrics/src/android/server/biometrics/BiometricSimpleTests.java
@@ -43,6 +43,7 @@ import android.util.Log;
 
 import com.android.server.biometrics.nano.SensorStateProto;
 
+import org.junit.Ignore;
 import org.junit.Test;
 import org.mockito.ArgumentCaptor;
 
@@ -301,7 +302,10 @@ public class BiometricSimpleTests extends BiometricTestBase {
      *
      * Upon successful authentication, checks that the result is
      * {@link BiometricPrompt#AUTHENTICATION_RESULT_TYPE_BIOMETRIC}
+     *
+     * TODO(b/236763921): fix this test and unignore.
      */
+    @Ignore
     @Test
     public void testSimpleBiometricAuth_nonConvenience() throws Exception {
         assumeTrue(Utils.isFirstApiLevel29orGreater());