From e307f22c287a2f5eecdc894973daf8cecff5bad3 Mon Sep 17 00:00:00 2001 From: Erfan Abdi Date: Sat, 25 Jul 2020 16:15:59 +0430 Subject: [PATCH] sweet: Disable NFC for indian devices * Setup sweet sku when device is global. * Move the nfc manifest entry to sweet hardware sku variant. Change-Id: I76ac75cd80f85efa6dfa68753602d934a11000a3 Signed-off-by: Arian --- BoardConfig.mk | 4 ++++ configs/hidl/manifest-nfc.xml | 11 +++++++++++ configs/hidl/manifest.xml | 9 --------- device.mk | 4 ++++ init/init_sweet.cpp | 1 + rootdir/etc/init.sweet.rc | 10 ++++++++++ 6 files changed, 30 insertions(+), 9 deletions(-) create mode 100644 configs/hidl/manifest-nfc.xml create mode 100644 rootdir/etc/init.sweet.rc diff --git a/BoardConfig.mk b/BoardConfig.mk index 44a1b90..3edcb1e 100644 --- a/BoardConfig.mk +++ b/BoardConfig.mk @@ -20,6 +20,10 @@ TARGET_PROVIDES_AUDIO_EXTNS := true DEVICE_FRAMEWORK_COMPATIBILITY_MATRIX_FILE := $(DEVICE_PATH)/configs/hidl/device_framework_compatibility_matrix.xml DEVICE_FRAMEWORK_COMPATIBILITY_MATRIX_FILE += vendor/lineage/config/device_framework_matrix.xml DEVICE_MANIFEST_FILE += $(DEVICE_PATH)/configs/hidl/manifest.xml +ODM_MANIFEST_SKUS += sweet +ODM_MANIFEST_SWEET_FILES := \ + $(COMMON_PATH)/configs/hidl/manifest-qva.xml \ + $(DEVICE_PATH)/configs/hidl/manifest-nfc.xml # Init TARGET_INIT_VENDOR_LIB := //$(DEVICE_PATH):libinit_sweet diff --git a/configs/hidl/manifest-nfc.xml b/configs/hidl/manifest-nfc.xml new file mode 100644 index 0000000..02182c0 --- /dev/null +++ b/configs/hidl/manifest-nfc.xml @@ -0,0 +1,11 @@ + + + android.hardware.nfc + hwbinder + 1.2 + + INfc + default + + + diff --git a/configs/hidl/manifest.xml b/configs/hidl/manifest.xml index 7e18468..f55d45f 100644 --- a/configs/hidl/manifest.xml +++ b/configs/hidl/manifest.xml @@ -8,13 +8,4 @@ default - - android.hardware.nfc - hwbinder - 1.2 - - INfc - default - - diff --git a/device.mk b/device.mk index b9bae35..95a75f4 100644 --- a/device.mk +++ b/device.mk @@ -44,6 +44,10 @@ PRODUCT_COPY_FILES += \ $(LOCAL_PATH)/rootdir/etc/fstab.qcom:$(TARGET_COPY_OUT_RAMDISK)/fstab.qcom \ $(LOCAL_PATH)/rootdir/etc/fstab.qcom:$(TARGET_COPY_OUT_VENDOR)/etc/fstab.qcom +# Init scripts +PRODUCT_COPY_FILES += \ + $(LOCAL_PATH)/rootdir/etc/init.sweet.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.sweet.rc + # NFC PRODUCT_PACKAGES += \ com.android.nfc_extras \ diff --git a/init/init_sweet.cpp b/init/init_sweet.cpp index 113c815..39fbab7 100644 --- a/init/init_sweet.cpp +++ b/init/init_sweet.cpp @@ -91,6 +91,7 @@ void vendor_load_properties() { fingerprint = "Redmi/sweet_eea/sweet:11/RKQ1.200826.002/V12.0.10.0.RKFEUXM:user/release-keys"; description = "sweet_eea-user 11 RKQ1.200826.002 V12.0.10.0.RKFEUXM release-keys"; mod_device = "sweet_eea_global"; + property_override("ro.boot.product.hardware.sku", "sweet"); } else if (region == "INDIA") { if (sku == "std") { model = "M2101K6P"; diff --git a/rootdir/etc/init.sweet.rc b/rootdir/etc/init.sweet.rc new file mode 100644 index 0000000..f29f425 --- /dev/null +++ b/rootdir/etc/init.sweet.rc @@ -0,0 +1,10 @@ +on property:ro.boot.product.hardware.sku=sweet + enable vendor.nfc_hal_service + +service vendor.nfc_hal_service /vendor/bin/hw/android.hardware.nfc@1.2-service + override + class hal + user nfc + group nfc + writepid /dev/cpuset/system-background/tasks + disabled