From cccbd64ff74ee45a48eaf6a68e97349fb9542c92 Mon Sep 17 00:00:00 2001
From: Ilya Matyukhin <ilyamaty@google.com>
Date: Fri, 27 Mar 2020 21:53:17 +0000
Subject: [PATCH] Revert "Temporarily remove support for biometrics.face@1.1"

This reverts commit ec297f3eb23659463c305352ae4ef35eefd4d880.

Reason for revert: reverting a temporary revert

Change-Id: Ie48bf3f8983b008f9eff9e0ce8fe283dded775ce
---
 services/core/Android.bp                            |  2 +-
 .../android/server/biometrics/face/FaceService.java | 13 ++++++++++++-
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/services/core/Android.bp b/services/core/Android.bp
index 052026c2746aa..69d6c5678075b 100644
--- a/services/core/Android.bp
+++ b/services/core/Android.bp
@@ -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.0-java",
+        "android.hardware.biometrics.face-V1.1-java",
         "android.hardware.biometrics.fingerprint-V2.2-java",
         "android.hardware.oemlock-V1.0-java",
         "android.hardware.configstore-V1.0-java",
diff --git a/services/core/java/com/android/server/biometrics/face/FaceService.java b/services/core/java/com/android/server/biometrics/face/FaceService.java
index bdcea3767678f..a540759847ecd 100644
--- a/services/core/java/com/android/server/biometrics/face/FaceService.java
+++ b/services/core/java/com/android/server/biometrics/face/FaceService.java
@@ -1043,7 +1043,18 @@ public class FaceService extends BiometricServiceBase {
             for (int i = 0; i < cryptoToken.length; i++) {
                 token.add(cryptoToken[i]);
             }
-            return daemon.enroll(token, timeout, disabledFeatures);
+            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