Revert "axolotl: fingerprint: disable on GSIs"
This reverts commit 1f077e573e2c5ec5adf31ab56daf26e0b8411e45.
Reason for revert: fingerprint is now working in gsi
Test: run cts-on-gsi -m CtsBiometricsTestCases
Test: run cts-on-gsi -m CtsHardwareTestCases -t android.hardware.fingerprint.cts.FingerprintManagerTest
Test: run vts -m VtsHalBiometricsFingerprintV2_1TargetTest
Test: run vts -m VtsHalBiometricsFingerprintV2_2TargetTest
Change-Id: I2fd7f18dedddf457ad05c5b78f28fc4b9bc1499e
diff --git a/device.mk b/device.mk
index 82a37ee..a5c0a4a 100644
--- a/device.mk
+++ b/device.mk
@@ -211,9 +211,6 @@
PRODUCT_PACKAGES += \
android.hardware.biometrics.fingerprint@2.1-service \
-PRODUCT_COPY_FILES += \
- frameworks/native/data/etc/android.hardware.fingerprint.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/permissions/android.hardware.fingerprint.xml \
-
# FM packages
PRODUCT_PACKAGES += \
FM2 \
@@ -230,6 +227,7 @@
frameworks/native/data/etc/android.hardware.camera.front.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.camera.front.xml \
frameworks/native/data/etc/android.hardware.camera.full.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.camera.full.xml \
frameworks/native/data/etc/android.hardware.camera.raw.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.camera.raw.xml \
+ frameworks/native/data/etc/android.hardware.fingerprint.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.fingerprint.xml \
frameworks/native/data/etc/android.hardware.location.gps.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.location.gps.xml \
frameworks/native/data/etc/android.hardware.nfc.hce.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.nfc.hce.xml \
frameworks/native/data/etc/android.hardware.nfc.hcef.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.nfc.hcef.xml \