From 5dfc569e852e6cee5460ce121cfbc720d8276bd0 Mon Sep 17 00:00:00 2001
From: Isaac Chen <ycchen@google.com>
Date: Thu, 6 Jul 2023 04:23:32 +0000
Subject: [PATCH] Revert "Require permission for hidden APIs in
 BiometricPrompt"

This reverts commit 7d4c562c64da63f34e9ec9aae01effb4208d0545.

Reason for revert: breaks the test
CtsHardwareTestCases android.hardware.fingerprint.cts.FingerprintManagerTest#test_authenticate

Bug: 290141448
Change-Id: I23b8e5d7bf89ce86f06e8cc6209f1d497fd2ddfe
---
 core/java/android/hardware/biometrics/BiometricPrompt.java | 6 ------
 core/java/android/hardware/biometrics/PromptInfo.java      | 6 ------
 2 files changed, 12 deletions(-)

diff --git a/core/java/android/hardware/biometrics/BiometricPrompt.java b/core/java/android/hardware/biometrics/BiometricPrompt.java
index 1fdb377de19ac..2e40f6096ccb4 100644
--- a/core/java/android/hardware/biometrics/BiometricPrompt.java
+++ b/core/java/android/hardware/biometrics/BiometricPrompt.java
@@ -144,7 +144,6 @@ public class BiometricPrompt implements BiometricAuthenticator, BiometricConstan
         private Context mContext;
         private IAuthService mService;
 
-        // LINT.IfChange
         /**
          * Creates a builder for a {@link BiometricPrompt} dialog.
          * @param context The {@link Context} that will be used to build the prompt.
@@ -418,7 +417,6 @@ public class BiometricPrompt implements BiometricAuthenticator, BiometricConstan
          * @hide
          */
         @NonNull
-        @RequiresPermission(USE_BIOMETRIC_INTERNAL)
         public Builder setDisallowBiometricsIfPolicyExists(boolean checkDevicePolicyManager) {
             mPromptInfo.setDisallowBiometricsIfPolicyExists(checkDevicePolicyManager);
             return this;
@@ -431,7 +429,6 @@ public class BiometricPrompt implements BiometricAuthenticator, BiometricConstan
          * @hide
          */
         @NonNull
-        @RequiresPermission(USE_BIOMETRIC_INTERNAL)
         public Builder setReceiveSystemEvents(boolean set) {
             mPromptInfo.setReceiveSystemEvents(set);
             return this;
@@ -445,7 +442,6 @@ public class BiometricPrompt implements BiometricAuthenticator, BiometricConstan
          * @hide
          */
         @NonNull
-        @RequiresPermission(USE_BIOMETRIC_INTERNAL)
         public Builder setIgnoreEnrollmentState(boolean ignoreEnrollmentState) {
             mPromptInfo.setIgnoreEnrollmentState(ignoreEnrollmentState);
             return this;
@@ -458,12 +454,10 @@ public class BiometricPrompt implements BiometricAuthenticator, BiometricConstan
          * @hide
          */
         @NonNull
-        @RequiresPermission(USE_BIOMETRIC_INTERNAL)
         public Builder setIsForLegacyFingerprintManager(int sensorId) {
             mPromptInfo.setIsForLegacyFingerprintManager(sensorId);
             return this;
         }
-        // LINT.ThenChange(frameworks/base/core/java/android/hardware/biometrics/PromptInfo.java)
 
         /**
          * Creates a {@link BiometricPrompt}.
diff --git a/core/java/android/hardware/biometrics/PromptInfo.java b/core/java/android/hardware/biometrics/PromptInfo.java
index 77df01b6592e0..02aad1dc4b4b0 100644
--- a/core/java/android/hardware/biometrics/PromptInfo.java
+++ b/core/java/android/hardware/biometrics/PromptInfo.java
@@ -126,7 +126,6 @@ public class PromptInfo implements Parcelable {
         return false;
     }
 
-    // LINT.IfChange
     public boolean containsPrivateApiConfigurations() {
         if (mDisallowBiometricsIfPolicyExists) {
             return true;
@@ -142,14 +141,9 @@ public class PromptInfo implements Parcelable {
             return true;
         } else if (mReceiveSystemEvents) {
             return true;
-        } else if (mIgnoreEnrollmentState) {
-            return true;
-        } else if (mIsForLegacyFingerprintManager) {
-            return true;
         }
         return false;
     }
-    // LINT.ThenChange(frameworks/base/core/java/android/hardware/biometrics/BiometricPrompt.java)
 
     // Setters