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

Commit c4fda76a authored by Ilya Matyukhin's avatar Ilya Matyukhin Committed by Android (Google) Code Review
Browse files

Merge changes I7f7464f6,I634200f0 

* changes:
  Temporarily remove support for biometrics.fingerprint@2.2
  Temporarily remove support for biometrics.face@1.1
parents ebe7e629 ecdeac75

services/core/Android.bp

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

        "android.hardware.health-V2.1-java",

        "android.hardware.light-java",

        "android.hardware.light-java",

        "android.hardware.weaver-V1.0-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.biometrics.fingerprint-V2.2-java",

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

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

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

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

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

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

            for (int i = 0; i < cryptoToken.length; i++) {

                token.add(cryptoToken[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);

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

            } else {

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

                return ERROR_ESRCH;

            }

        }

        }





        @Override

        @Override

services/core/java/com/android/server/biometrics/fingerprint/FingerprintService.java

+2 −28
Original line number Original line Diff line number Diff line
@@ -663,18 +663,7 @@ public class FingerprintService extends BiometricServiceBase { 
                Slog.w(TAG, "authenticate(): no fingerprint HAL!");

                Slog.w(TAG, "authenticate(): no fingerprint HAL!");

                return ERROR_ESRCH;

                return ERROR_ESRCH;

            }

            }

            android.hardware.biometrics.fingerprint.V2_2.IBiometricsFingerprint daemon22 =

                    android.hardware.biometrics.fingerprint.V2_2.IBiometricsFingerprint.castFrom(

                            daemon);

            if (daemon22 != null) {

                return daemon22.authenticate_2_2(operationId, groupId,

                        convertSurfaceToNativeHandle(surface));

            } else if (surface == null) {

            return daemon.authenticate(operationId, groupId);

            return daemon.authenticate(operationId, groupId);

            } else {

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

                return ERROR_ESRCH;

            }

        }

        }





        @Override

        @Override
@@ -715,22 +704,7 @@ public class FingerprintService extends BiometricServiceBase { 
                Slog.w(TAG, "enroll(): no fingerprint HAL!");

                Slog.w(TAG, "enroll(): no fingerprint HAL!");

                return ERROR_ESRCH;

                return ERROR_ESRCH;

            }

            }

            android.hardware.biometrics.fingerprint.V2_2.IBiometricsFingerprint daemon22 =

                    android.hardware.biometrics.fingerprint.V2_2.IBiometricsFingerprint.castFrom(

                            daemon);

            if (daemon22 != null) {

                ArrayList<Byte> cryptoTokenAsList = new ArrayList<>(cryptoToken.length);

                for (byte b : cryptoToken) {

                    cryptoTokenAsList.add(b);

                }

                return daemon22.enroll_2_2(cryptoTokenAsList, groupId, timeout,

                        convertSurfaceToNativeHandle(surface));

            } else if (surface == null) {

            return daemon.enroll(cryptoToken, groupId, timeout);

            return daemon.enroll(cryptoToken, groupId, timeout);

            } else {

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

                return ERROR_ESRCH;

            }

        }

        }





        @Override

        @Override