Revert "Add some new modality-specific APIs in BiometricManager."

Revert submission 32295314-fm_to_bm

Reason for revert:b/406937567#comment7
Bug: 406937567

Reverted changes: /q/submissionid:32295314-fm_to_bm
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:ca851226c8aa3f83e40445db238715251bd38b37)
Merged-In: I7c9a506362b74bfe9f876b1191f3f8da4c93cd4c
Change-Id: I7c9a506362b74bfe9f876b1191f3f8da4c93cd4c

7 files changed, 2 insertions, 299 deletions

diff --git a/core/api/system-current.txt b/core/api/system-current.txt
index 6ebc03681c0b..a0547411cd9e 100644
--- a/core/api/system-current.txt
+++ b/core/api/system-current.txt
@@ -4933,20 +4933,6 @@ package android.hardware {
 
 package android.hardware.biometrics {
 
-  @FlaggedApi("android.hardware.biometrics.move_fm_api_to_bm") public final class BiometricEnrollmentStatus implements android.os.Parcelable {
-    method public int describeContents();
-    method @IntRange(from=0) public int getEnrollCount();
-    method public int getModality();
-    method public void writeToParcel(@NonNull android.os.Parcel, int);
-    field @NonNull public static final android.os.Parcelable.Creator<android.hardware.biometrics.BiometricEnrollmentStatus> CREATOR;
-  }
-
-  public class BiometricManager {
-    method @FlaggedApi("android.hardware.biometrics.move_fm_api_to_bm") @NonNull @RequiresPermission(android.Manifest.permission.SET_BIOMETRIC_DIALOG_ADVANCED) public java.util.Set<android.hardware.biometrics.BiometricEnrollmentStatus> getEnrollmentStatus();
-    field @FlaggedApi("android.hardware.biometrics.move_fm_api_to_bm") @RequiresPermission(android.Manifest.permission.SET_BIOMETRIC_DIALOG_ADVANCED) public static final int TYPE_FACE = 8; // 0x8
-    field @FlaggedApi("android.hardware.biometrics.move_fm_api_to_bm") @RequiresPermission(android.Manifest.permission.SET_BIOMETRIC_DIALOG_ADVANCED) public static final int TYPE_FINGERPRINT = 2; // 0x2
-  }
-
   public static interface BiometricManager.Authenticators {
     field @RequiresPermission(android.Manifest.permission.WRITE_DEVICE_CONFIG) public static final int BIOMETRIC_CONVENIENCE = 4095; // 0xfff
     field @RequiresPermission(android.Manifest.permission.WRITE_DEVICE_CONFIG) public static final int EMPTY_SET = 0; // 0x0
diff --git a/core/java/android/hardware/biometrics/BiometricEnrollmentStatus.aidl b/core/java/android/hardware/biometrics/BiometricEnrollmentStatus.aidl
deleted file mode 100644
index 2d28f3dddb83..000000000000
--- a/core/java/android/hardware/biometrics/BiometricEnrollmentStatus.aidl
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * Copyright (C) 2025 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package android.hardware.biometrics;
-
-// @hide
-parcelable BiometricEnrollmentStatus;
diff --git a/core/java/android/hardware/biometrics/BiometricEnrollmentStatus.java b/core/java/android/hardware/biometrics/BiometricEnrollmentStatus.java
deleted file mode 100644
index f883b9f72d7c..000000000000
--- a/core/java/android/hardware/biometrics/BiometricEnrollmentStatus.java
+++ /dev/null
@@ -1,108 +0,0 @@
-/*
- * Copyright (C) 2025 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package android.hardware.biometrics;
-
-import android.annotation.FlaggedApi;
-import android.annotation.IntRange;
-import android.annotation.NonNull;
-import android.annotation.SystemApi;
-import android.os.Parcel;
-import android.os.Parcelable;
-
-/**
- * This class contains enrollment information. It keeps track of the modality type (e.g.
- * fingerprint, face) and the number of times the biometric has been enrolled.
- *
- * @hide
- */
-@SystemApi
-@FlaggedApi(Flags.FLAG_MOVE_FM_API_TO_BM)
-public final class BiometricEnrollmentStatus implements Parcelable {
-    @BiometricManager.BiometricModality
-    private final int mModality;
-    private final int mEnrollCount;
-
-    /**
-     * @hide
-     */
-    public BiometricEnrollmentStatus(
-            @BiometricManager.BiometricModality int modality, int enrollCount) {
-        mModality = modality;
-        mEnrollCount = enrollCount;
-    }
-
-    /**
-     * Returns the modality associated with this enrollment status.
-     *
-     * @return The int value representing the biometric sensor type, e.g.
-     * {@link BiometricManager#TYPE_FACE} or
-     * {@link BiometricManager#TYPE_FINGERPRINT}.
-     */
-    @BiometricManager.BiometricModality
-    public int getModality() {
-        return mModality;
-    }
-
-    /**
-     * Returns the number of enrolled biometric for the associated modality.
-     *
-     * @return The number of enrolled biometric.
-     */
-    @IntRange(from = 0)
-    public int getEnrollCount() {
-        return mEnrollCount;
-    }
-
-    private BiometricEnrollmentStatus(Parcel in) {
-        this(in.readInt(), in.readInt());
-    }
-
-    @NonNull
-    public static final Creator<BiometricEnrollmentStatus> CREATOR = new Creator<>() {
-        @Override
-        public BiometricEnrollmentStatus createFromParcel(Parcel in) {
-            return new BiometricEnrollmentStatus(in);
-        }
-
-        @Override
-        public BiometricEnrollmentStatus[] newArray(int size) {
-            return new BiometricEnrollmentStatus[size];
-        }
-    };
-
-    @Override
-    public void writeToParcel(@NonNull Parcel dest, int flags) {
-        dest.writeInt(mModality);
-        dest.writeInt(mEnrollCount);
-    }
-
-    @Override
-    public int describeContents() {
-        return 0;
-    }
-
-    @Override
-    public String toString() {
-        String modality = "";
-        if (mModality == BiometricManager.TYPE_FINGERPRINT) {
-            modality = "Fingerprint";
-        } else if (mModality == BiometricManager.TYPE_FACE) {
-            modality = "Face";
-        }
-        return "Modality: " + modality + ", Enrolled Count: " + mEnrollCount;
-    }
-}
diff --git a/core/java/android/hardware/biometrics/BiometricManager.java b/core/java/android/hardware/biometrics/BiometricManager.java
index 8ac24c81a9f0..cefe20c15ced 100644
--- a/core/java/android/hardware/biometrics/BiometricManager.java
+++ b/core/java/android/hardware/biometrics/BiometricManager.java
@@ -16,7 +16,6 @@
 
 package android.hardware.biometrics;
 
-import static android.Manifest.permission.SET_BIOMETRIC_DIALOG_ADVANCED;
 import static android.Manifest.permission.TEST_BIOMETRIC;
 import static android.Manifest.permission.USE_BIOMETRIC;
 import static android.Manifest.permission.USE_BIOMETRIC_INTERNAL;
@@ -46,9 +45,7 @@ import com.android.internal.util.FrameworkStatsLog;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.util.ArrayList;
-import java.util.HashSet;
 import java.util.List;
-import java.util.Set;
 
 /**
  * A class that contains biometric utilities. For authentication, see {@link BiometricPrompt}.
@@ -146,37 +143,6 @@ public class BiometricManager {
     public @interface BiometricError {}
 
     /**
-     * Constant representing fingerprint.
-     * @hide
-     */
-    @SystemApi
-    @FlaggedApi(Flags.FLAG_MOVE_FM_API_TO_BM)
-    @RequiresPermission(SET_BIOMETRIC_DIALOG_ADVANCED)
-    public static final int TYPE_FINGERPRINT = BiometricAuthenticator.TYPE_FINGERPRINT;
-
-    /**
-     * Constant representing face.
-     * @hide
-     */
-    @SystemApi
-    @FlaggedApi(Flags.FLAG_MOVE_FM_API_TO_BM)
-    @RequiresPermission(SET_BIOMETRIC_DIALOG_ADVANCED)
-    public static final int TYPE_FACE = BiometricAuthenticator.TYPE_FACE;
-
-    /**
-     * An {@link IntDef} representing the biometric modalities.
-     * @hide
-     */
-    @IntDef(flag = true, value = {
-            TYPE_FINGERPRINT,
-            TYPE_FACE
-    })
-    @Retention(RetentionPolicy.SOURCE)
-    @interface BiometricModality {
-    }
-
-
-    /**
      * Types of authenticators, defined at a level of granularity supported by
      * {@link BiometricManager} and {@link BiometricPrompt}.
      *
@@ -440,6 +406,8 @@ public class BiometricManager {
 
     /**
      * @hide
+     * @param context
+     * @param service
      */
     public BiometricManager(@NonNull Context context, @NonNull IAuthService service) {
         mContext = context;
@@ -599,37 +567,6 @@ public class BiometricManager {
     }
 
     /**
-     * Return the current biometrics enrollment status set.
-     *
-     * <p>Returning more than one status indicates that the device supports multiple biometric
-     * modalities (e.g., fingerprint, face, iris). Each {@link BiometricEnrollmentStatus} object
-     * within the returned collection provides detailed information about the enrollment state for a
-     * particular modality.
-     *
-     * <p>This method is intended for system apps, such as settings or device setup, which require
-     * detailed enrollment information to show or hide features or to encourage users to enroll
-     * in a specific modality. Applications should instead use
-     * {@link BiometricManager#canAuthenticate(int)} to check the enrollment status and use the
-     * enroll intent, when needed to allow users to enroll. That ensures that users are presented
-     * with a consistent set of options across all of their apps and can be redirected to a
-     * single system-managed settings surface.</p>
-     *
-     * @hide
-     */
-    @SystemApi
-    @RequiresPermission(SET_BIOMETRIC_DIALOG_ADVANCED)
-    @FlaggedApi(Flags.FLAG_MOVE_FM_API_TO_BM)
-    @NonNull
-    public Set<BiometricEnrollmentStatus> getEnrollmentStatus() {
-        try {
-            return new HashSet<BiometricEnrollmentStatus>(
-                    mService.getEnrollmentStatus(mContext.getOpPackageName()));
-        } catch (RemoteException e) {
-            throw e.rethrowFromSystemServer();
-        }
-    }
-
-    /**
      * @hide
      * @param userId
      * @return
diff --git a/core/java/android/hardware/biometrics/IAuthService.aidl b/core/java/android/hardware/biometrics/IAuthService.aidl
index b6ce79af00fe..8514f98fbf0d 100644
--- a/core/java/android/hardware/biometrics/IAuthService.aidl
+++ b/core/java/android/hardware/biometrics/IAuthService.aidl
@@ -22,7 +22,6 @@ import android.hardware.biometrics.IBiometricServiceReceiver;
 import android.hardware.biometrics.IInvalidationCallback;
 import android.hardware.biometrics.ITestSession;
 import android.hardware.biometrics.ITestSessionCallback;
-import android.hardware.biometrics.BiometricEnrollmentStatus;
 import android.hardware.biometrics.PromptInfo;
 import android.hardware.biometrics.SensorPropertiesInternal;
 
@@ -65,9 +64,6 @@ interface IAuthService {
     // Checks if any biometrics are enrolled.
     boolean hasEnrolledBiometrics(int userId, String opPackageName);
 
-    // Return the current biometrics enrollment status.
-    List<BiometricEnrollmentStatus> getEnrollmentStatus(String opPackageName);
-
     // Register callback for when keyguard biometric eligibility changes.
     void registerEnabledOnKeyguardCallback(IBiometricEnabledOnKeyguardCallback callback);
 
diff --git a/services/core/java/com/android/server/biometrics/AuthService.java b/services/core/java/com/android/server/biometrics/AuthService.java
index eede4c9c59d0..b6768c9c087a 100644
--- a/services/core/java/com/android/server/biometrics/AuthService.java
+++ b/services/core/java/com/android/server/biometrics/AuthService.java
@@ -36,7 +36,6 @@ import android.content.Context;
 import android.content.pm.PackageManager;
 import android.hardware.biometrics.AuthenticationStateListener;
 import android.hardware.biometrics.BiometricAuthenticator;
-import android.hardware.biometrics.BiometricEnrollmentStatus;
 import android.hardware.biometrics.BiometricManager;
 import android.hardware.biometrics.ComponentInfoInternal;
 import android.hardware.biometrics.IAuthService;
@@ -418,55 +417,6 @@ public class AuthService extends SystemService {
         }
 
         @Override
-        public List<BiometricEnrollmentStatus> getEnrollmentStatus(String opPackageName)
-                throws RemoteException {
-            checkBiometricAdvancedPermission();
-            final long identity = Binder.clearCallingIdentity();
-            try {
-                final int userId = UserHandle.myUserId();
-                final List<BiometricEnrollmentStatus> enrollmentStatusList =
-                        new ArrayList<>();
-                final IFingerprintService fingerprintService = mInjector.getFingerprintService();
-                if (fingerprintService != null) {
-                    final List<FingerprintSensorPropertiesInternal> fpProps =
-                            fingerprintService.getSensorPropertiesInternal(opPackageName);
-                    if (!fpProps.isEmpty()) {
-                        int fpCount = fingerprintService.getEnrolledFingerprints(userId,
-                                opPackageName, getContext().getAttributionTag()).size();
-                        enrollmentStatusList.add(
-                                new BiometricEnrollmentStatus(
-                                        BiometricManager.TYPE_FINGERPRINT, fpCount));
-                    } else {
-                        Slog.e(TAG, "No fingerprint sensors");
-                    }
-                } else {
-                    Slog.e(TAG, "No fingerprint sensors");
-                }
-
-                final IFaceService faceService = mInjector.getFaceService();
-                if (faceService != null) {
-                    final List<FaceSensorPropertiesInternal> faceProps =
-                            faceService.getSensorPropertiesInternal(opPackageName);
-                    if (!faceProps.isEmpty()) {
-                        int faceCount = faceService.getEnrolledFaces(faceProps.getFirst().sensorId,
-                                userId, opPackageName).size();
-                        enrollmentStatusList.add(
-                                new BiometricEnrollmentStatus(
-                                        BiometricManager.TYPE_FACE, faceCount));
-                    } else {
-                        Slog.e(TAG, "No face sensors");
-                    }
-                } else {
-                    Slog.e(TAG, "No face sensors");
-                }
-
-                return enrollmentStatusList;
-            } finally {
-                Binder.restoreCallingIdentity(identity);
-            }
-        }
-
-        @Override
         public void registerEnabledOnKeyguardCallback(
                 IBiometricEnabledOnKeyguardCallback callback) throws RemoteException {
             checkInternalPermission();
diff --git a/services/tests/servicestests/src/com/android/server/biometrics/AuthServiceTest.java b/services/tests/servicestests/src/com/android/server/biometrics/AuthServiceTest.java
index cebdce9ed6cc..c7efa318af99 100644
--- a/services/tests/servicestests/src/com/android/server/biometrics/AuthServiceTest.java
+++ b/services/tests/servicestests/src/com/android/server/biometrics/AuthServiceTest.java
@@ -49,14 +49,11 @@ import android.hardware.biometrics.IBiometricEnabledOnKeyguardCallback;
 import android.hardware.biometrics.IBiometricService;
 import android.hardware.biometrics.IBiometricServiceReceiver;
 import android.hardware.biometrics.PromptInfo;
-import android.hardware.biometrics.SensorProperties;
 import android.hardware.biometrics.fingerprint.SensorProps;
 import android.hardware.face.FaceSensorConfigurations;
-import android.hardware.face.FaceSensorProperties;
 import android.hardware.face.FaceSensorPropertiesInternal;
 import android.hardware.face.IFaceService;
 import android.hardware.fingerprint.FingerprintSensorConfigurations;
-import android.hardware.fingerprint.FingerprintSensorProperties;
 import android.hardware.fingerprint.FingerprintSensorPropertiesInternal;
 import android.hardware.fingerprint.IFingerprintService;
 import android.hardware.iris.IIrisService;
@@ -87,7 +84,6 @@ import org.mockito.junit.MockitoJUnit;
 import org.mockito.junit.MockitoRule;
 import org.mockito.stubbing.Stubber;
 
-import java.util.ArrayList;
 import java.util.List;
 
 @Presubmit
@@ -523,41 +519,6 @@ public class AuthServiceTest {
         verify(mBiometricService).getLastAuthenticationTime(eq(mUserId), eq(authenticators));
     }
 
-    @Test
-    public void testGetEnrollmentStatus_callsFingerprintAndFaceService() throws Exception {
-        setInternalAndTestBiometricPermissions(mContext, true /* hasPermission */);
-        List<FaceSensorPropertiesInternal> faceProps = List.of(new FaceSensorPropertiesInternal(
-                0 /* id */,
-                FaceSensorProperties.STRENGTH_STRONG,
-                1 /* maxTemplatesAllowed */,
-                new ArrayList<>() /* componentInfo */,
-                FaceSensorProperties.TYPE_UNKNOWN,
-                true /* supportsFaceDetection */,
-                true /* supportsSelfIllumination */,
-                false /* resetLockoutRequiresChallenge */));
-        List<FingerprintSensorPropertiesInternal> fpProps = List.of(
-                new FingerprintSensorPropertiesInternal(1 /* id */,
-                        SensorProperties.STRENGTH_STRONG,
-                        5 /* maxEnrollmentsPerUser */,
-                        new ArrayList<>() /* componentInfo */,
-                        FingerprintSensorProperties.TYPE_UDFPS_OPTICAL,
-                        false /* resetLockoutRequiresHardwareAuthToken */));
-        when(mFaceService.getSensorPropertiesInternal(eq(TEST_OP_PACKAGE_NAME))).thenReturn(
-                faceProps);
-        when(mFingerprintService.getSensorPropertiesInternal(eq(TEST_OP_PACKAGE_NAME))).thenReturn(
-                fpProps);
-        when(mContext.getAttributionTag()).thenReturn("tag");
-        mAuthService = new AuthService(mContext, mInjector);
-        mAuthService.onStart();
-
-        mAuthService.mImpl.getEnrollmentStatus(TEST_OP_PACKAGE_NAME);
-
-        waitForIdle();
-        verify(mFaceService).getEnrolledFaces(eq(0), eq(mUserId), eq(TEST_OP_PACKAGE_NAME));
-        verify(mFingerprintService).getEnrolledFingerprints(eq(mUserId), eq(TEST_OP_PACKAGE_NAME),
-                eq("tag"));
-    }
-
     private static void setInternalAndTestBiometricPermissions(
             Context context, boolean hasPermission) {
         for (String p : List.of(TEST_BIOMETRIC, MANAGE_BIOMETRIC, USE_BIOMETRIC_INTERNAL)) {