1 files changed, 2 insertions, 20 deletions

diff --git a/core/java/android/hardware/biometrics/PromptInfo.java b/core/java/android/hardware/biometrics/PromptInfo.java
index 2742f0effde6..e6b762a64384 100644
--- a/core/java/android/hardware/biometrics/PromptInfo.java
+++ b/core/java/android/hardware/biometrics/PromptInfo.java
@@ -46,7 +46,6 @@ public class PromptInfo implements Parcelable {
     @NonNull private List<Integer> mAllowedSensorIds = new ArrayList<>();
     private boolean mAllowBackgroundAuthentication;
     private boolean mIgnoreEnrollmentState;
-    private boolean mIsForLegacyFingerprintManager = false;
 
     public PromptInfo() {
 
@@ -69,7 +68,6 @@ public class PromptInfo implements Parcelable {
         mAllowedSensorIds = in.readArrayList(Integer.class.getClassLoader());
         mAllowBackgroundAuthentication = in.readBoolean();
         mIgnoreEnrollmentState = in.readBoolean();
-        mIsForLegacyFingerprintManager = in.readBoolean();
     }
 
     public static final Creator<PromptInfo> CREATOR = new Creator<PromptInfo>() {
@@ -107,15 +105,10 @@ public class PromptInfo implements Parcelable {
         dest.writeList(mAllowedSensorIds);
         dest.writeBoolean(mAllowBackgroundAuthentication);
         dest.writeBoolean(mIgnoreEnrollmentState);
-        dest.writeBoolean(mIsForLegacyFingerprintManager);
     }
 
     public boolean containsTestConfigurations() {
-        if (mIsForLegacyFingerprintManager
-                && mAllowedSensorIds.size() == 1
-                && !mAllowBackgroundAuthentication) {
-            return false;
-        } else if (!mAllowedSensorIds.isEmpty()) {
+        if (!mAllowedSensorIds.isEmpty()) {
             return true;
         } else if (mAllowBackgroundAuthentication) {
             return true;
@@ -195,8 +188,7 @@ public class PromptInfo implements Parcelable {
     }
 
     public void setAllowedSensorIds(@NonNull List<Integer> sensorIds) {
-        mAllowedSensorIds.clear();
-        mAllowedSensorIds.addAll(sensorIds);
+        mAllowedSensorIds = sensorIds;
     }
 
     public void setAllowBackgroundAuthentication(boolean allow) {
@@ -207,12 +199,6 @@ public class PromptInfo implements Parcelable {
         mIgnoreEnrollmentState = ignoreEnrollmentState;
     }
 
-    public void setIsForLegacyFingerprintManager(int sensorId) {
-        mIsForLegacyFingerprintManager = true;
-        mAllowedSensorIds.clear();
-        mAllowedSensorIds.add(sensorId);
-    }
-
     // Getters
 
     public CharSequence getTitle() {
@@ -286,8 +272,4 @@ public class PromptInfo implements Parcelable {
     public boolean isIgnoreEnrollmentState() {
         return mIgnoreEnrollmentState;
     }
-
-    public boolean isForLegacyFingerprintManager() {
-        return mIsForLegacyFingerprintManager;
-    }
 }