Evolution-X-Devices/device_xiaomi_raphael
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

raphael: Go back to non-eSE NFC support

Browse Source
This commit is contained in:
Sebastiano Barezzi
2024-08-29 19:00:59 +03:00
committed by Joey Huab
parent 5813bf4256
commit dcf60dc804
8 changed files with 6 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
BoardConfig.mk
View File

@@ -78,11 +78,8 @@ DEVICE_FRAMEWORK_COMPATIBILITY_MATRIX_FILE := \
DEVICE_MANIFEST_FILE := $(DEVICE_PATH)/hidl/manifest.xml
DEVICE_MATRIX_FILE := $(DEVICE_PATH)/hidl/compatibility_matrix.xml
DEVICE_FRAMEWORK_COMPATIBILITY_MATRIX_FILE := $(DEVICE_PATH)/hidl/framework_compatibility_matrix.xml
ODM_MANIFEST_SKUS += nfc nfc_ese
ODM_MANIFEST_SKUS += nfc
ODM_MANIFEST_NFC_FILES := $(DEVICE_PATH)/hidl/manifest_nfc.xml
ODM_MANIFEST_NFC_ESE_FILES := \
$(DEVICE_PATH)/hidl/manifest_nfc.xml \
$(DEVICE_PATH)/hidl/manifest_ese.xml
# Init
TARGET_INIT_VENDOR_LIB := //$(DEVICE_PATH):init_xiaomi_raphael

10
device.mk
View File

@@ -421,16 +421,6 @@ PRODUCT_COPY_FILES += \
frameworks/native/data/etc/android.hardware.se.omapi.uicc.xml:$(TARGET_COPY_OUT_ODM)/etc/permissions/sku_nfc/android.hardware.se.omapi.uicc.xml \
frameworks/native/data/etc/com.android.nfc_extras.xml:$(TARGET_COPY_OUT_ODM)/etc/permissions/sku_nfc/com.android.nfc_extras.xml
PRODUCT_COPY_FILES += \
frameworks/native/data/etc/android.hardware.nfc.ese.xml:$(TARGET_COPY_OUT_ODM)/etc/permissions/sku_nfc_ese/android.hardware.nfc.ese.xml \
frameworks/native/data/etc/android.hardware.nfc.hce.xml:$(TARGET_COPY_OUT_ODM)/etc/permissions/sku_nfc_ese/android.hardware.nfc.hce.xml \
frameworks/native/data/etc/android.hardware.nfc.hcef.xml:$(TARGET_COPY_OUT_ODM)/etc/permissions/sku_nfc_ese/android.hardware.nfc.hcef.xml \
frameworks/native/data/etc/android.hardware.nfc.uicc.xml:$(TARGET_COPY_OUT_ODM)/etc/permissions/sku_nfc_ese/android.hardware.nfc.uicc.xml \
frameworks/native/data/etc/android.hardware.nfc.xml:$(TARGET_COPY_OUT_ODM)/etc/permissions/sku_nfc_ese/android.hardware.nfc.xml \
frameworks/native/data/etc/android.hardware.se.omapi.ese.xml:$(TARGET_COPY_OUT_ODM)/etc/permissions/sku_nfc_ese/android.hardware.se.omapi.ese.xml \
frameworks/native/data/etc/android.hardware.se.omapi.uicc.xml:$(TARGET_COPY_OUT_ODM)/etc/permissions/sku_nfc_ese/android.hardware.se.omapi.uicc.xml \
frameworks/native/data/etc/com.android.nfc_extras.xml:$(TARGET_COPY_OUT_ODM)/etc/permissions/sku_nfc_ese/com.android.nfc_extras.xml
# OMX
PRODUCT_PACKAGES += \
android.hardware.media.omx@1.0-service \

12
hidl/manifest_ese.xml
View File

@@ -1,12 +0,0 @@
<manifest version="2.0" type="device">
<hal format="hidl">
<name>android.hardware.secure_element</name>
<transport>hwbinder</transport>
<fqname>@1.2::ISecureElement/eSE1</fqname>
</hal>
<hal format="hidl">
<name>vendor.qti.esepowermanager</name>
<transport>hwbinder</transport>
<fqname>@1.1::IEsePowerManager/default</fqname>
</hal>
</manifest>

8
libinit/include/libinit_variant.h
View File

@@ -10,12 +10,6 @@
#include <string>
#include <vector>
enum nfc_type {
NFC_TYPE_NONE = 0,
NFC_TYPE_NFC,
NFC_TYPE_NFC_ESE,
};
typedef struct variant_info {
std::string hwc_value;
std::string sku_value;
@@ -26,7 +20,7 @@ typedef struct variant_info {
std::string model;
std::string build_fingerprint;
nfc_type nfc;
bool nfc;
} variant_info_t;
void search_variant(const std::vector<variant_info_t> variants);

6
libinit/init_xiaomi_raphael.cpp
View File

@@ -21,7 +21,7 @@ static const variant_info_t raphael_global_info = {
.model = "Mi 9T Pro",
.build_fingerprint = FINGERPRINT,
.nfc = NFC_TYPE_NFC_ESE,
.nfc = true,
};
static const variant_info_t raphaelin_info = {
@@ -34,7 +34,7 @@ static const variant_info_t raphaelin_info = {
.model = "Redmi K20 Pro",
.build_fingerprint = FINGERPRINT,
.nfc = NFC_TYPE_NONE,
.nfc = false,
};
static const variant_info_t raphael_info = {
@@ -47,7 +47,7 @@ static const variant_info_t raphael_info = {
.model = "Redmi K20 Pro",
.build_fingerprint = FINGERPRINT,
.nfc = NFC_TYPE_NFC_ESE,
.nfc = true,
};
static const std::vector<variant_info_t> variants = {

4
libinit/libinit_variant.cpp
View File

@@ -41,8 +41,6 @@ void set_variant_props(const variant_info_t variant) {
property_override("ro.build.description", fingerprint_to_description(variant.build_fingerprint));
}
if (variant.nfc == NFC_TYPE_NFC)
if (variant.nfc)
property_override(SKU_PROP, "nfc");
else if (variant.nfc == NFC_TYPE_NFC_ESE)
property_override(SKU_PROP, "nfc_ese");
}

15
proprietary-files.txt
View File

@@ -544,13 +544,6 @@ vendor/lib64/vendor.qti.hardware.qseecom@1.0.so
vendor/lib64/libdisp-aba.so|44993853ff9d4340e856e6f53d802f10372442d3
vendor/lib64/libdisplayqos.so|5548732c916e629f18f45ce257ce843b679a136a
# ESE - from LA.UM.9.1.r1-13700-SMxxx0.QSSI13.0
vendor/bin/hw/vendor.qti.esepowermanager@1.1-service|7339b9b331b357649aae521f84d3e56dd3d3def7
vendor/etc/init/vendor.qti.esepowermanager@1.1-service.rc|23d2b5420086843f6be78889abf5c4fc8ed4ae41
vendor/lib64/hw/vendor.qti.esepowermanager@1.1-impl.so|7b67b47030f00af1c2e207995eea05f05fb91b23
vendor/lib64/vendor.qti.esepowermanager@1.0.so|6585b5976a98053fb4d2b51c32337ebe8960d427
vendor/lib64/vendor.qti.esepowermanager@1.1.so|61d7c35edb403f8de4be2e483431cb26109ef0ae
# FM (system) - from LA.QSSI.12.0.r1-05800.02-qssi.0
-system_ext/lib64/vendor.qti.hardware.fm@1.0.so|b9dc0797da5790a7d5f1c9a7a2fd9c4a7b87d304
system_ext/lib64/fm_helium.so|f5c9cc8de62340ab8b38cca2555eeac9ab18d84b
@@ -1102,14 +1095,6 @@ vendor/radio/qcril_database/upgrade/7_version_update_ecc_table.sql|9a76d5747da28
vendor/radio/qcril_database/upgrade/8_version_update_ecc_table.sql|a0603a5c46e8e67f78bdb42f2b246ecc6a37cecd
vendor/radio/qcril_database/upgrade/9_version_update_ecc_table.sql|4701219a79190995eda651e5c45e11c9b111a478
# Secure Element
vendor/bin/hw/vendor.qti.secure_element@1.2-service
vendor/etc/init/vendor.qti.secure_element@1.2-service.rc
vendor/lib64/android.hardware.secure_element@1.0-impl.so
vendor/lib64/jcos_nq_client.so
vendor/lib64/ls_nq_client.so
vendor/lib64/se_nq_extn_client.so
# Sensors
vendor/bin/sensors.qti
vendor/bin/sscrpcd

19
rootdir/etc/init.xiaomi.rc
View File

@@ -90,24 +90,5 @@ service vendor.nfc_hal_service /vendor/bin/hw/android.hardware.nfc@1.2-service
task_profiles ServiceCapacityLow
disabled
service secureelement-hal_1_2 /vendor/bin/hw/vendor.qti.secure_element@1.2-service
override
class hal
user system
group system
disabled
service qti_esepowermanager_service_1_1 /vendor/bin/hw/vendor.qti.esepowermanager@1.1-service
override
class hal
user system
group nfc system
disabled
on boot && property:ro.boot.product.hardware.sku=nfc
enable vendor.nfc_hal_service
on boot && property:ro.boot.product.hardware.sku=nfc_ese
enable vendor.nfc_hal_service
enable secureelement-hal_1_2
enable qti_esepowermanager_service_1_1