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

Commit ec297f3e authored by Ilya Matyukhin's avatar Ilya Matyukhin
Browse files

Temporarily remove support for biometrics.face@1.1 

This is necessary to allow the changes from rvc-dev to merge cleanly.

Bug: 151331855
Test: enrollment and authentication works
Change-Id: I634200f09517ae7da9b41f25bc7395c3603b3436
parent 6c20bcd0

services/core/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -118,7 +118,7 @@ java_library_static { 
        "android.hardware.health-V2.1-java",

        "android.hardware.light-java",

        "android.hardware.weaver-V1.0-java",

        "android.hardware.biometrics.face-V1.1-java",

        "android.hardware.biometrics.face-V1.0-java",

        "android.hardware.biometrics.fingerprint-V2.2-java",

        "android.hardware.oemlock-V1.0-java",

        "android.hardware.configstore-V1.0-java",

services/core/java/com/android/server/biometrics/face/FaceService.java

+1 −12
Original line number Diff line number Diff line
@@ -1038,18 +1038,7 @@ public class FaceService extends BiometricServiceBase { 
            for (int i = 0; i < cryptoToken.length; i++) {

                token.add(cryptoToken[i]);

            }

            android.hardware.biometrics.face.V1_1.IBiometricsFace daemon11 =

                    android.hardware.biometrics.face.V1_1.IBiometricsFace.castFrom(

                            daemon);

            if (daemon11 != null) {

                return daemon11.enroll_1_1(token, timeout, disabledFeatures,

                        convertSurfaceToNativeHandle(surface));

            } else if (surface == null) {

            return daemon.enroll(token, timeout, disabledFeatures);

            } else {

                Slog.e(TAG, "enroll(): surface is only supported in @1.1 HAL");

                return ERROR_ESRCH;

            }

        }



        @Override