From 2b6a38b06f83c2f330c98eb949973084285eff9c Mon Sep 17 00:00:00 2001
From: Abir Ghosh <abirg@codeaurora.org>
Date: Mon, 4 Sep 2017 15:26:55 +0530
Subject: [PATCH] sdm660_64: Do not enable fingerprint by default

- Remove fingerprint entries from manifest.xml
  and sdm660_64.mk.
- Do not enable FEATURE_FINGERPRINT by default.

Change-Id: Ic1870c76dc61e3ee3f75b9809846debeba7f30c8
---
 manifest.xml | 19 -------------------
 sdm660_64.mk |  4 ----
 2 files changed, 23 deletions(-)

diff --git a/manifest.xml b/manifest.xml
index b679a94c..357eb8fd 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -174,25 +174,6 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
             <instance>legacy/0</instance>
         </interface>
     </hal>
-    <!-- fingerprint hal: using remote service instead of Google's default service-->
-    <hal format="hidl">
-        <name>android.hardware.biometrics.fingerprint</name>
-        <transport>hwbinder</transport>
-        <version>2.1</version>
-        <interface>
-            <name>IBiometricsFingerprint</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
-    <hal format="hidl">
-        <name>vendor.qti.hardware.fingerprint</name>
-        <transport>hwbinder</transport>
-        <version>1.0</version>
-        <interface>
-            <name>IQtiExtendedFingerprint</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
     <hal format="hidl">
         <name>android.hardware.bluetooth</name>
         <transport>hwbinder</transport>
diff --git a/sdm660_64.mk b/sdm660_64.mk
index 675ee83a..60f4d966 100644
--- a/sdm660_64.mk
+++ b/sdm660_64.mk
@@ -153,10 +153,6 @@ PRODUCT_PACKAGES += \
     wpa_supplicant_overlay.conf \
     p2p_supplicant_overlay.conf
 
-# Fingerprint feature
-PRODUCT_COPY_FILES += \
-    frameworks/native/data/etc/android.hardware.fingerprint.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.fingerprint.xml \
-
 #ANT+ stack
 PRODUCT_PACKAGES += \
     AntHalService \