From dc6cafdb24b69740f355adca956ba8d02d53576c Mon Sep 17 00:00:00 2001
From: Nick Desaulniers <ndesaulniers@google.com>
Date: Wed, 22 Feb 2017 16:06:31 -0800
Subject: [PATCH 1/2] Revert "device-common: don't build fingerprint
 HAL+service"

This reverts commit 109d659016d90fa8eae4c58b6418cfeebfcdc733.

Bug: 34795013
Bug: 35390533
Change-Id: I8a5117e513496ee5b2c3d7b9e5fd0f24c18f9924
---
 device-common.mk | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/device-common.mk b/device-common.mk
index 3073251..042e9e3 100644
--- a/device-common.mk
+++ b/device-common.mk
@@ -323,9 +323,9 @@ PRODUCT_COPY_FILES += \
     $(LOCAL_PATH)/lowi.conf:system/etc/lowi.conf
 
 # Fingerprint HIDL implementation
-#PRODUCT_PACKAGES += \
-#    fingerprint.fpc \
-#    android.hardware.biometrics.fingerprint@2.1-service
+PRODUCT_PACKAGES += \
+    fingerprint.fpc \
+    android.hardware.biometrics.fingerprint@2.1-service
 
 PRODUCT_COPY_FILES += \
     frameworks/native/data/etc/android.hardware.fingerprint.xml:system/etc/permissions/android.hardware.fingerprint.xml

From 2552e4a3f518c7a9daf7026ada3a14cdb8d6ecf6 Mon Sep 17 00:00:00 2001
From: Nick Desaulniers <ndesaulniers@google.com>
Date: Wed, 22 Feb 2017 19:10:07 -0800
Subject: [PATCH 2/2] muskie: fingerprint: add to vendor interface manifest

Bug: 34795013
Change-Id: If500965181ad8f9ac8c7bdf5d7a28e14e8d13b63
---
 vintf.xml | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/vintf.xml b/vintf.xml
index b466f85..7cf294f 100644
--- a/vintf.xml
+++ b/vintf.xml
@@ -5,5 +5,10 @@
         <impl level="generic"></impl>
         <version>2.0</version>
     </hal>
+    <hal format="hidl">
+        <name>android.hardware.biometrics.fingerprint</name>
+        <transport>hwbinder</transport>
+        <impl level="generic"></impl>
+        <version>2.1</version>
+    </hal>
 </manifest>
-