Revert "Update RemovalClient to support new biometric AIDL"

Revert submission 13593269

Reason for revert: Bug: 180689674
Reverted Changes:
I59f6e607f:Update RemovalClient to support new biometric AIDL...
I3fdb3fe0b:Try to ensure tests run sequentially

Change-Id: I939172f2961f3f2c9f8eddd59261f75552eeb31f

4 files changed, 12 insertions, 40 deletions

diff --git a/core/java/android/hardware/face/FaceManager.java b/core/java/android/hardware/face/FaceManager.java
index 28bc404efb36..588bc01d7d42 100644
--- a/core/java/android/hardware/face/FaceManager.java
+++ b/core/java/android/hardware/face/FaceManager.java
@@ -562,23 +562,12 @@ public class FaceManager implements BiometricAuthenticator, BiometricFaceConstan
                 mService.remove(mToken, face.getBiometricId(), userId, mServiceReceiver,
                         mContext.getOpPackageName());
             } catch (RemoteException e) {
-                throw e.rethrowFromSystemServer();
-            }
-        }
-    }
-
-    /**
-     * Removes all face templates for the given user.
-     * @hide
-     */
-    @RequiresPermission(MANAGE_BIOMETRIC)
-    public void removeAll(int userId, @NonNull RemovalCallback callback) {
-        if (mService != null) {
-            try {
-                mRemovalCallback = callback;
-                mService.removeAll(mToken, userId, mServiceReceiver, mContext.getOpPackageName());
-            } catch (RemoteException e) {
-                throw e.rethrowFromSystemServer();
+                Slog.w(TAG, "Remote exception in remove: ", e);
+                if (callback != null) {
+                    callback.onRemovalError(face, FACE_ERROR_HW_UNAVAILABLE,
+                            getErrorString(mContext, FACE_ERROR_HW_UNAVAILABLE,
+                                0 /* vendorCode */));
+                }
             }
         }
     }
diff --git a/core/java/android/hardware/face/IFaceService.aidl b/core/java/android/hardware/face/IFaceService.aidl
index a2e0b3b1cb41..a3e7e2d2c5cb 100644
--- a/core/java/android/hardware/face/IFaceService.aidl
+++ b/core/java/android/hardware/face/IFaceService.aidl
@@ -83,13 +83,10 @@ interface IFaceService {
     // Cancel enrollment in progress
     void cancelEnrollment(IBinder token);
 
-    // Removes the specified face enrollment for the specified userId.
+    // Any errors resulting from this call will be returned to the listener
     void remove(IBinder token, int faceId, int userId, IFaceServiceReceiver receiver,
             String opPackageName);
 
-    // Removes all face enrollments for the specified userId.
-    void removeAll(IBinder token, int userId, IFaceServiceReceiver receiver, String opPackageName);
-
     // Get the enrolled face for user.
     List<Face> getEnrolledFaces(int sensorId, int userId, String opPackageName);
 
diff --git a/core/java/android/hardware/fingerprint/FingerprintManager.java b/core/java/android/hardware/fingerprint/FingerprintManager.java
index 6df2764d3f8b..a614ebfe1793 100644
--- a/core/java/android/hardware/fingerprint/FingerprintManager.java
+++ b/core/java/android/hardware/fingerprint/FingerprintManager.java
@@ -739,22 +739,11 @@ public class FingerprintManager implements BiometricAuthenticator, BiometricFing
             mService.remove(mToken, fp.getBiometricId(), userId, mServiceReceiver,
                     mContext.getOpPackageName());
         } catch (RemoteException e) {
-            throw e.rethrowFromSystemServer();
-        }
-    }
-
-    /**
-     * Removes all face templates for the given user.
-     * @hide
-     */
-    @RequiresPermission(MANAGE_FINGERPRINT)
-    public void removeAll(int userId, @NonNull RemovalCallback callback) {
-        if (mService != null) {
-            try {
-                mRemovalCallback = callback;
-                mService.removeAll(mToken, userId, mServiceReceiver, mContext.getOpPackageName());
-            } catch (RemoteException e) {
-                throw e.rethrowFromSystemServer();
+            Slog.w(TAG, "Remote exception in remove: ", e);
+            if (callback != null) {
+                callback.onRemovalError(fp, FINGERPRINT_ERROR_HW_UNAVAILABLE,
+                        getErrorString(mContext, FINGERPRINT_ERROR_HW_UNAVAILABLE,
+                            0 /* vendorCode */));
             }
         }
     }
diff --git a/core/java/android/hardware/fingerprint/IFingerprintService.aidl b/core/java/android/hardware/fingerprint/IFingerprintService.aidl
index 1694fef0f71b..8888247e2823 100644
--- a/core/java/android/hardware/fingerprint/IFingerprintService.aidl
+++ b/core/java/android/hardware/fingerprint/IFingerprintService.aidl
@@ -87,9 +87,6 @@ interface IFingerprintService {
     void remove(IBinder token, int fingerId, int userId, IFingerprintServiceReceiver receiver,
             String opPackageName);
 
-    // Removes all face enrollments for the specified userId.
-    void removeAll(IBinder token, int userId, IFingerprintServiceReceiver receiver, String opPackageName);
-
     // Rename the fingerprint specified by fingerId and userId to the given name
     void rename(int fingerId, int userId, String name);