Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b82bc5af authored by Joshua Mccloskey's avatar Joshua Mccloskey Committed by Android (Google) Code Review
Browse files

Merge "Revert^2 "Temporarily remove support for biometrics.face@1.1"" into sc-dev

parents 57471856 fff77ec2

services/core/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -129,8 +129,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",

services/core/java/com/android/server/biometrics/sensors/face/hidl/FaceAuthenticationClient.java

+1 −1
Original line number Diff line number Diff line
@@ -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<IBiometricsFace> {

services/core/java/com/android/server/biometrics/sensors/face/hidl/FaceEnrollClient.java

+3 −12
Original line number Diff line number Diff line
@@ -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<IBiometricsFace> {
@@ -103,18 +103,9 @@ public class FaceEnrollClient extends EnrollClient<IBiometricsFace> { 
            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 */);

services/core/java/com/android/server/biometrics/sensors/face/hidl/FaceGenerateChallengeClient.java

+1 −2
Original line number Diff line number Diff line
@@ -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<IBiometricsFace> {

services/core/java/com/android/server/biometrics/sensors/face/hidl/FaceGetFeatureClient.java

+1 −1
Original line number Diff line number Diff line
@@ -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<IBiometricsFace> {