diff --git a/fingerprint/board.mk b/fingerprint/board.mk
new file mode 100644
index 0000000..c981627
--- /dev/null
+++ b/fingerprint/board.mk
@@ -0,0 +1,2 @@
+# Fingerprint
+DEVICE_MANIFEST_FILE += $(COMMON_PATH)/fingerprint/manifest.xml
diff --git a/fingerprint/manifest.xml b/fingerprint/manifest.xml
new file mode 100644
index 0000000..115dd7b
--- /dev/null
+++ b/fingerprint/manifest.xml
@@ -0,0 +1,11 @@
+
+
+ android.hardware.biometrics.fingerprint
+ hwbinder
+ 2.1
+
+ IBiometricsFingerprint
+ default
+
+
+
diff --git a/fingerprint/product.mk b/fingerprint/product.mk
new file mode 100644
index 0000000..1de7f77
--- /dev/null
+++ b/fingerprint/product.mk
@@ -0,0 +1,7 @@
+# Fingerprint
+PRODUCT_PACKAGES += \
+ android.hardware.biometrics.fingerprint@2.1-service \
+ fingerprint.msm8974
+
+PRODUCT_COPY_FILES += \
+ frameworks/native/data/etc/android.hardware.fingerprint.xml:system/etc/permissions/android.hardware.fingerprint.xml
diff --git a/klte.mk b/klte.mk
index e48571e..9c3ef84 100644
--- a/klte.mk
+++ b/klte.mk
@@ -62,11 +62,6 @@ PRODUCT_AAPT_PREF_CONFIG := xxhdpi
PRODUCT_PACKAGES += \
SamsungDoze
-# Fingerprint
-PRODUCT_PACKAGES += \
- android.hardware.biometrics.fingerprint@2.1-service \
- fingerprint.msm8974
-
# FlipFlap
PRODUCT_PACKAGES += \
FlipFlap
@@ -123,7 +118,6 @@ PRODUCT_PACKAGES += \
PRODUCT_COPY_FILES += \
frameworks/native/data/etc/android.hardware.audio.low_latency.xml:system/etc/permissions/android.hardware.audio.low_latency.xml \
frameworks/native/data/etc/android.hardware.consumerir.xml:system/etc/permissions/android.hardware.consumerir.xml \
- frameworks/native/data/etc/android.hardware.fingerprint.xml:system/etc/permissions/android.hardware.fingerprint.xml \
frameworks/native/data/etc/android.hardware.nfc.xml:system/etc/permissions/android.hardware.nfc.xml \
frameworks/native/data/etc/android.hardware.nfc.hce.xml:system/etc/permissions/android.hardware.nfc.hce.xml \
frameworks/native/data/etc/android.hardware.sensor.stepcounter.xml:system/etc/permissions/android.hardware.sensor.stepcounter.xml \
diff --git a/manifest.xml b/manifest.xml
index 85e6481..897e84d 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -17,15 +17,6 @@
default
-
- android.hardware.biometrics.fingerprint
- hwbinder
- 2.1
-
- IBiometricsFingerprint
- default
-
-
android.hardware.bluetooth
passthrough