From db778a5e9c44a62aafb6e8a0b1a7b52785ad6208 Mon Sep 17 00:00:00 2001 From: Joshua Mccloskey Date: Tue, 26 Jan 2021 18:27:27 -0800 Subject: Added debug parameter to FaceService Bug: 177244088 Test: Verified debug parameter is correctly sent to the hal. Change-Id: If71d86528f1bd9c6d0b75cdff36ec9fdbee47fa6 --- core/java/android/hardware/face/FaceManager.java | 23 +++++++++++++---------- core/java/android/hardware/face/IFaceService.aidl | 2 +- 2 files changed, 14 insertions(+), 11 deletions(-) (limited to 'core/java/android') diff --git a/core/java/android/hardware/face/FaceManager.java b/core/java/android/hardware/face/FaceManager.java index 75893d978749..588bc01d7d42 100644 --- a/core/java/android/hardware/face/FaceManager.java +++ b/core/java/android/hardware/face/FaceManager.java @@ -301,7 +301,8 @@ public class FaceManager implements BiometricAuthenticator, BiometricFaceConstan @RequiresPermission(MANAGE_BIOMETRIC) public void enroll(int userId, byte[] hardwareAuthToken, CancellationSignal cancel, EnrollmentCallback callback, int[] disabledFeatures) { - enroll(userId, hardwareAuthToken, cancel, callback, disabledFeatures, null /* surface */); + enroll(userId, hardwareAuthToken, cancel, callback, disabledFeatures, null /* surface */, + false /* debugConsent */); } /** @@ -313,18 +314,20 @@ public class FaceManager implements BiometricAuthenticator, BiometricFaceConstan * which point the object is no longer valid. The operation can be canceled by using the * provided cancel object. * - * @param token a unique token provided by a recent creation or verification of device - * credentials (e.g. pin, pattern or password). - * @param cancel an object that can be used to cancel enrollment - * @param userId the user to whom this face will belong to - * @param callback an object to receive enrollment events - * @param surface optional camera preview surface for a single-camera device. Must be null if - * not used. + * @param hardwareAuthToken a unique token provided by a recent creation or + * verification of device credentials (e.g. pin, pattern or password). + * @param cancel an object that can be used to cancel enrollment + * @param userId the user to whom this face will belong to + * @param callback an object to receive enrollment events + * @param surface optional camera preview surface for a single-camera device. + * Must be null if not used. + * @param debugConsent a feature flag that the user has consented to debug. * @hide */ @RequiresPermission(MANAGE_BIOMETRIC) public void enroll(int userId, byte[] hardwareAuthToken, CancellationSignal cancel, - EnrollmentCallback callback, int[] disabledFeatures, @Nullable Surface surface) { + EnrollmentCallback callback, int[] disabledFeatures, @Nullable Surface surface, + boolean debugConsent) { if (callback == null) { throw new IllegalArgumentException("Must supply an enrollment callback"); } @@ -343,7 +346,7 @@ public class FaceManager implements BiometricAuthenticator, BiometricFaceConstan mEnrollmentCallback = callback; Trace.beginSection("FaceManager#enroll"); mService.enroll(userId, mToken, hardwareAuthToken, mServiceReceiver, - mContext.getOpPackageName(), disabledFeatures, surface); + mContext.getOpPackageName(), disabledFeatures, surface, debugConsent); } catch (RemoteException e) { Slog.w(TAG, "Remote exception in enroll: ", e); // Though this may not be a hardware issue, it will cause apps to give up or diff --git a/core/java/android/hardware/face/IFaceService.aidl b/core/java/android/hardware/face/IFaceService.aidl index 1b188e87e90f..a3e7e2d2c5cb 100644 --- a/core/java/android/hardware/face/IFaceService.aidl +++ b/core/java/android/hardware/face/IFaceService.aidl @@ -74,7 +74,7 @@ interface IFaceService { // Start face enrollment void enroll(int userId, IBinder token, in byte [] hardwareAuthToken, IFaceServiceReceiver receiver, - String opPackageName, in int [] disabledFeatures, in Surface surface); + String opPackageName, in int [] disabledFeatures, in Surface surface, boolean debugConsent); // Start remote face enrollment void enrollRemotely(int userId, IBinder token, in byte [] hardwareAuthToken, IFaceServiceReceiver receiver, -- cgit v1.2.3