Revert "Add CTS coverage for new BiometricPrompt getters"
This reverts commit 9e2b08c2eefe8451af1f3c4760e524f0dbaf2074.
Reason for revert: This breaks the cts-kernel-presubmit-aosp_kernel-common-android-4.19
See sponge/target?id=b8514476-ed9d-4d0e-8ac8-53c48fd3efaa&target=x86+CtsHardwareTestCases&searchFor&show=FAILED&sortBy=STATUS&view=TREE
The build to reproduce this is ab/6401995
Change-Id: I7e5f27fd8bf28fd48e991961e1a1fb0b8da355c8
Bug: 154297628
diff --git a/tests/tests/hardware/src/android/hardware/biometrics/cts/BiometricPromptTest.java b/tests/tests/hardware/src/android/hardware/biometrics/cts/BiometricPromptTest.java
index a05c933..8e2f9e4 100644
--- a/tests/tests/hardware/src/android/hardware/biometrics/cts/BiometricPromptTest.java
+++ b/tests/tests/hardware/src/android/hardware/biometrics/cts/BiometricPromptTest.java
@@ -17,7 +17,6 @@
package android.hardware.biometrics.cts;
import android.content.pm.PackageManager;
-import android.hardware.biometrics.BiometricManager.Authenticators;
import android.hardware.biometrics.BiometricPrompt;
import android.os.CancellationSignal;
import android.os.Handler;
@@ -73,25 +72,17 @@
}
boolean exceptionTaken = false;
- final String title = "Title";
- final String subtitle = "Subtitle";
- final String description = "Description";
- final String negativeButtonText = "Negative";
CancellationSignal cancellationSignal = new CancellationSignal();
try {
BiometricPrompt.Builder builder = new BiometricPrompt.Builder(getContext());
- builder.setTitle(title);
- builder.setSubtitle(subtitle);
- builder.setDescription(description);
- builder.setNegativeButton(negativeButtonText, mExecutor, (dialog, which) -> {
+ builder.setTitle("Title");
+ builder.setSubtitle("Subtitle");
+ builder.setDescription("Description");
+ builder.setNegativeButton("Negative", mExecutor, (dialog, which) -> {
// Do nothing
});
BiometricPrompt prompt = builder.build();
- assertEquals(title, prompt.getTitle());
- assertEquals(subtitle, prompt.getSubtitle());
- assertEquals(description, prompt.getDescription());
- assertEquals(negativeButtonText, prompt.getNegativeButtonText());
prompt.authenticate(cancellationSignal, mExecutor, mAuthenticationCallback);
mLatch.await(AWAIT_TIMEOUT_MS, TimeUnit.MILLISECONDS);
@@ -104,39 +95,4 @@
}
}
- @Presubmit
- public void test_isConfirmationRequired() {
- BiometricPrompt.Builder promptBuilder = new BiometricPrompt.Builder(getContext())
- .setTitle("Title")
- .setNegativeButton("Cancel", mExecutor, (dialog, which) -> {
- // Do nothing.
- });
- assertTrue(promptBuilder.build().isConfirmationRequired());
- assertTrue(promptBuilder.setConfirmationRequired(true).build().isConfirmationRequired());
- assertFalse(promptBuilder.setConfirmationRequired(false).build().isConfirmationRequired());
- }
-
- @Presubmit
- public void test_setAllowedAuthenticators() {
- BiometricPrompt.Builder promptBuilder = new BiometricPrompt.Builder(getContext())
- .setTitle("Title 1")
- .setNegativeButton("Negative 1", mExecutor, (dialog, which) -> {
- // Do nothing.
- });
- assertEquals(0, promptBuilder.build().getAllowedAuthenticators());
-
- final int[] authenticatorCombinations = {
- Authenticators.BIOMETRIC_WEAK,
- Authenticators.BIOMETRIC_STRONG,
- Authenticators.DEVICE_CREDENTIAL,
- Authenticators.BIOMETRIC_WEAK | Authenticators.DEVICE_CREDENTIAL,
- Authenticators.BIOMETRIC_STRONG | Authenticators.DEVICE_CREDENTIAL
- };
- for (int authenticators : authenticatorCombinations) {
- final BiometricPrompt prompt = promptBuilder
- .setAllowedAuthenticators(authenticators)
- .build();
- assertEquals(authenticators, prompt.getAllowedAuthenticators());
- }
- }
}
