From fff77ec289d8b140dc81c01be76fc7a160a4e243 Mon Sep 17 00:00:00 2001 From: Joshua Mccloskey Date: Tue, 9 Feb 2021 03:46:16 +0000 Subject: [PATCH] Revert^2 "Temporarily remove support for biometrics.face@1.1" cccbd64ff74ee45a48eaf6a68e97349fb9542c92 Change-Id: I892ac32b31fe94ebe6298553925d2cc7535ee46e --- services/core/Android.bp | 2 +- .../face/hidl/FaceAuthenticationClient.java | 2 +- .../sensors/face/hidl/FaceEnrollClient.java | 15 +++------------ .../face/hidl/FaceGenerateChallengeClient.java | 3 +-- .../sensors/face/hidl/FaceGetFeatureClient.java | 2 +- .../face/hidl/FaceInternalCleanupClient.java | 3 +-- .../face/hidl/FaceInternalEnumerateClient.java | 3 +-- .../sensors/face/hidl/FaceRemovalClient.java | 2 +- .../sensors/face/hidl/FaceResetLockoutClient.java | 2 +- .../face/hidl/FaceRevokeChallengeClient.java | 2 +- .../sensors/face/hidl/FaceSetFeatureClient.java | 2 +- .../biometrics/sensors/face/hidl/TestHal.java | 13 +------------ 12 files changed, 14 insertions(+), 37 deletions(-) diff --git a/services/core/Android.bp b/services/core/Android.bp index 37d2cdc16926b..8baed202f8b2e 100644 --- a/services/core/Android.bp +++ b/services/core/Android.bp @@ -131,8 +131,8 @@ java_library_static { "android.hardware.light-V1-java", "android.hardware.tv.cec-V1.0-java", "android.hardware.weaver-V1.0-java", - "android.hardware.biometrics.face-V1.1-java", "android.hardware.biometrics.face-V1-java", + "android.hardware.biometrics.face-V1.0-java", "android.hardware.biometrics.fingerprint-V2.3-java", "android.hardware.biometrics.fingerprint-V1-java", "android.hardware.oemlock-V1.0-java", diff --git a/services/core/java/com/android/server/biometrics/sensors/face/hidl/FaceAuthenticationClient.java b/services/core/java/com/android/server/biometrics/sensors/face/hidl/FaceAuthenticationClient.java index 0b78dd01f8553..a4b3ac57a4dfc 100644 --- a/services/core/java/com/android/server/biometrics/sensors/face/hidl/FaceAuthenticationClient.java +++ b/services/core/java/com/android/server/biometrics/sensors/face/hidl/FaceAuthenticationClient.java @@ -46,7 +46,7 @@ import java.util.ArrayList; /** * Face-specific authentication client supporting the {@link android.hardware.biometrics.face.V1_0} - * and {@link android.hardware.biometrics.face.V1_1} HIDL interfaces. + * HIDL interface. */ class FaceAuthenticationClient extends AuthenticationClient { diff --git a/services/core/java/com/android/server/biometrics/sensors/face/hidl/FaceEnrollClient.java b/services/core/java/com/android/server/biometrics/sensors/face/hidl/FaceEnrollClient.java index 1a7544fc7f015..fc1200a4b42af 100644 --- a/services/core/java/com/android/server/biometrics/sensors/face/hidl/FaceEnrollClient.java +++ b/services/core/java/com/android/server/biometrics/sensors/face/hidl/FaceEnrollClient.java @@ -41,7 +41,7 @@ import java.util.Arrays; /** * Face-specific enroll client supporting the {@link android.hardware.biometrics.face.V1_0} - * and {@link android.hardware.biometrics.face.V1_1} HIDL interfaces. + * HIDL interface. */ public class FaceEnrollClient extends EnrollClient { @@ -103,18 +103,9 @@ public class FaceEnrollClient extends EnrollClient { disabledFeatures.add(disabledFeature); } - android.hardware.biometrics.face.V1_1.IBiometricsFace daemon11 = - android.hardware.biometrics.face.V1_1.IBiometricsFace.castFrom(getFreshDaemon()); try { - final int status; - if (daemon11 != null) { - status = daemon11.enroll_1_1(token, mTimeoutSec, disabledFeatures, mSurfaceHandle); - } else if (mSurfaceHandle == null) { - status = getFreshDaemon().enroll(token, mTimeoutSec, disabledFeatures); - } else { - Slog.e(TAG, "enroll(): surface is only supported in @1.1 HAL"); - status = BiometricFaceConstants.FACE_ERROR_UNABLE_TO_PROCESS; - } + final int status = getFreshDaemon().enroll(token, mTimeoutSec, disabledFeatures); + if (status != Status.OK) { onError(BiometricFaceConstants.FACE_ERROR_UNABLE_TO_PROCESS, 0 /* vendorCode */); mCallback.onClientFinished(this, false /* success */); diff --git a/services/core/java/com/android/server/biometrics/sensors/face/hidl/FaceGenerateChallengeClient.java b/services/core/java/com/android/server/biometrics/sensors/face/hidl/FaceGenerateChallengeClient.java index c3d54c2b7fbb6..72c5ee5e78c45 100644 --- a/services/core/java/com/android/server/biometrics/sensors/face/hidl/FaceGenerateChallengeClient.java +++ b/services/core/java/com/android/server/biometrics/sensors/face/hidl/FaceGenerateChallengeClient.java @@ -29,8 +29,7 @@ import com.android.server.biometrics.sensors.GenerateChallengeClient; /** * Face-specific generateChallenge client supporting the - * {@link android.hardware.biometrics.face.V1_0} and {@link android.hardware.biometrics.face.V1_1} - * HIDL interfaces. + * {@link android.hardware.biometrics.face.V1_0} HIDL interface. */ public class FaceGenerateChallengeClient extends GenerateChallengeClient { diff --git a/services/core/java/com/android/server/biometrics/sensors/face/hidl/FaceGetFeatureClient.java b/services/core/java/com/android/server/biometrics/sensors/face/hidl/FaceGetFeatureClient.java index 722a3b843e12b..b1083d410fec9 100644 --- a/services/core/java/com/android/server/biometrics/sensors/face/hidl/FaceGetFeatureClient.java +++ b/services/core/java/com/android/server/biometrics/sensors/face/hidl/FaceGetFeatureClient.java @@ -33,7 +33,7 @@ import com.android.server.biometrics.sensors.HalClientMonitor; /** * Face-specific getFeature client supporting the {@link android.hardware.biometrics.face.V1_0} - * and {@link android.hardware.biometrics.face.V1_1} HIDL interfaces. + * HIDL interface. */ public class FaceGetFeatureClient extends HalClientMonitor { diff --git a/services/core/java/com/android/server/biometrics/sensors/face/hidl/FaceInternalCleanupClient.java b/services/core/java/com/android/server/biometrics/sensors/face/hidl/FaceInternalCleanupClient.java index abfda499cf0f3..1e3b92dcbf619 100644 --- a/services/core/java/com/android/server/biometrics/sensors/face/hidl/FaceInternalCleanupClient.java +++ b/services/core/java/com/android/server/biometrics/sensors/face/hidl/FaceInternalCleanupClient.java @@ -33,8 +33,7 @@ import java.util.Map; /** * Face-specific internal cleanup client supporting the - * {@link android.hardware.biometrics.face.V1_0} and {@link android.hardware.biometrics.face.V1_1} - * HIDL interfaces. + * {@link android.hardware.biometrics.face.V1_0} HIDL interface. */ class FaceInternalCleanupClient extends InternalCleanupClient { diff --git a/services/core/java/com/android/server/biometrics/sensors/face/hidl/FaceInternalEnumerateClient.java b/services/core/java/com/android/server/biometrics/sensors/face/hidl/FaceInternalEnumerateClient.java index 9a0974b472cb0..f2a9afce1ff75 100644 --- a/services/core/java/com/android/server/biometrics/sensors/face/hidl/FaceInternalEnumerateClient.java +++ b/services/core/java/com/android/server/biometrics/sensors/face/hidl/FaceInternalEnumerateClient.java @@ -32,8 +32,7 @@ import java.util.List; /** * Face-specific internal enumerate client supporting the - * {@link android.hardware.biometrics.face.V1_0} and {@link android.hardware.biometrics.face.V1_1} - * HIDL interfaces. + * {@link android.hardware.biometrics.face.V1_0} HIDL interface. */ class FaceInternalEnumerateClient extends InternalEnumerateClient { private static final String TAG = "FaceInternalEnumerateClient"; diff --git a/services/core/java/com/android/server/biometrics/sensors/face/hidl/FaceRemovalClient.java b/services/core/java/com/android/server/biometrics/sensors/face/hidl/FaceRemovalClient.java index acae89928460f..d63791c99dd45 100644 --- a/services/core/java/com/android/server/biometrics/sensors/face/hidl/FaceRemovalClient.java +++ b/services/core/java/com/android/server/biometrics/sensors/face/hidl/FaceRemovalClient.java @@ -33,7 +33,7 @@ import java.util.Map; /** * Face-specific removal client supporting the {@link android.hardware.biometrics.face.V1_0} - * and {@link android.hardware.biometrics.face.V1_1} HIDL interfaces. + * HIDL interface. */ class FaceRemovalClient extends RemovalClient { private static final String TAG = "FaceRemovalClient"; diff --git a/services/core/java/com/android/server/biometrics/sensors/face/hidl/FaceResetLockoutClient.java b/services/core/java/com/android/server/biometrics/sensors/face/hidl/FaceResetLockoutClient.java index 14a46481ddc62..9d977d60e7059 100644 --- a/services/core/java/com/android/server/biometrics/sensors/face/hidl/FaceResetLockoutClient.java +++ b/services/core/java/com/android/server/biometrics/sensors/face/hidl/FaceResetLockoutClient.java @@ -30,7 +30,7 @@ import java.util.ArrayList; /** * Face-specific resetLockout client supporting the {@link android.hardware.biometrics.face.V1_0} - * and {@link android.hardware.biometrics.face.V1_1} HIDL interfaces. + * HIDL interface. */ public class FaceResetLockoutClient extends HalClientMonitor { diff --git a/services/core/java/com/android/server/biometrics/sensors/face/hidl/FaceRevokeChallengeClient.java b/services/core/java/com/android/server/biometrics/sensors/face/hidl/FaceRevokeChallengeClient.java index e5edfafcef61b..28580dece2848 100644 --- a/services/core/java/com/android/server/biometrics/sensors/face/hidl/FaceRevokeChallengeClient.java +++ b/services/core/java/com/android/server/biometrics/sensors/face/hidl/FaceRevokeChallengeClient.java @@ -27,7 +27,7 @@ import com.android.server.biometrics.sensors.RevokeChallengeClient; /** * Face-specific revokeChallenge client supporting the {@link android.hardware.biometrics.face.V1_0} - * and {@link android.hardware.biometrics.face.V1_1} HIDL interfaces. + * HIDL interface. */ public class FaceRevokeChallengeClient extends RevokeChallengeClient { diff --git a/services/core/java/com/android/server/biometrics/sensors/face/hidl/FaceSetFeatureClient.java b/services/core/java/com/android/server/biometrics/sensors/face/hidl/FaceSetFeatureClient.java index 6290e001f65b3..cc3d8f0e28ba5 100644 --- a/services/core/java/com/android/server/biometrics/sensors/face/hidl/FaceSetFeatureClient.java +++ b/services/core/java/com/android/server/biometrics/sensors/face/hidl/FaceSetFeatureClient.java @@ -33,7 +33,7 @@ import java.util.ArrayList; /** * Face-specific setFeature client supporting the {@link android.hardware.biometrics.face.V1_0} - * and {@link android.hardware.biometrics.face.V1_1} HIDL interfaces. + * HIDL interface. */ public class FaceSetFeatureClient extends HalClientMonitor { diff --git a/services/core/java/com/android/server/biometrics/sensors/face/hidl/TestHal.java b/services/core/java/com/android/server/biometrics/sensors/face/hidl/TestHal.java index bab1114dc70d6..0ed5130ff8f3b 100644 --- a/services/core/java/com/android/server/biometrics/sensors/face/hidl/TestHal.java +++ b/services/core/java/com/android/server/biometrics/sensors/face/hidl/TestHal.java @@ -18,11 +18,11 @@ package com.android.server.biometrics.sensors.face.hidl; import android.annotation.Nullable; import android.hardware.biometrics.face.V1_0.FaceError; +import android.hardware.biometrics.face.V1_0.IBiometricsFace; import android.hardware.biometrics.face.V1_0.IBiometricsFaceClientCallback; import android.hardware.biometrics.face.V1_0.OptionalBool; import android.hardware.biometrics.face.V1_0.OptionalUint64; import android.hardware.biometrics.face.V1_0.Status; -import android.hardware.biometrics.face.V1_1.IBiometricsFace; import android.os.NativeHandle; import android.os.RemoteException; @@ -118,15 +118,4 @@ public class TestHal extends IBiometricsFace.Stub { return 0; } - @Override - public int enrollRemotely(ArrayList hat, int timeoutSec, - ArrayList disabledFeatures) { - return 0; - } - - @Override - public int enroll_1_1(ArrayList hat, int timeoutSec, ArrayList disabledFeatures, - NativeHandle nativeHandle) { - return 0; - } }