Evolution-X-Tensor/device_google_pantah
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert "Switch NFC from HIDL to AIDL"

Browse source 
This reverts commit 908d5c56f9.

Reason for revert: Broken tests
Bug: 230834308

Change-Id: I2bfa841fb7af7fa963cbf270f2c9626f93d7146d
This commit is contained in:
George Chang 2022-04-29 23:36:15 +08:00
parent 908d5c56f9
commit 82df7ed9d2
7 changed files with 21 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

3
device-cheetah.mk
View file

@ -91,7 +91,7 @@ PRODUCT_COPY_FILES += \
PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \
NfcNci \ NfcNci \
Tag \ Tag \
android.hardware.nfc-service.st android.hardware.nfc@1.2-service.st
# SecureElement # SecureElement
PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \
@ -105,6 +105,7 @@ PRODUCT_COPY_FILES += \
device/google/pantah/nfc/libse-gto-hal2.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libse-gto-hal2.conf device/google/pantah/nfc/libse-gto-hal2.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libse-gto-hal2.conf
DEVICE_MANIFEST_FILE += \ DEVICE_MANIFEST_FILE += \
device/google/pantah/nfc/manifest_nfc.xml \
device/google/pantah/nfc/manifest_se.xml device/google/pantah/nfc/manifest_se.xml
# Thermal Config # Thermal Config

3
device-cloudripper.mk
View file

@ -60,7 +60,7 @@ PRODUCT_COPY_FILES += \
PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \
NfcNci \ NfcNci \
Tag \ Tag \
android.hardware.nfc-service.st android.hardware.nfc@1.2-service.st
# SecureElement # SecureElement
PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \
@ -74,6 +74,7 @@ PRODUCT_COPY_FILES += \
device/google/pantah/nfc/libse-gto-hal2.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libse-gto-hal2.conf device/google/pantah/nfc/libse-gto-hal2.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libse-gto-hal2.conf
DEVICE_MANIFEST_FILE += \ DEVICE_MANIFEST_FILE += \
device/google/pantah/nfc/manifest_nfc.xml \
device/google/pantah/nfc/manifest_se.xml device/google/pantah/nfc/manifest_se.xml
# Thermal Config # Thermal Config

3
device-panther.mk
View file

@ -78,7 +78,7 @@ PRODUCT_COPY_FILES += \
PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \
NfcNci \ NfcNci \
Tag \ Tag \
android.hardware.nfc-service.st android.hardware.nfc@1.2-service.st
# SecureElement # SecureElement
PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \
@ -92,6 +92,7 @@ PRODUCT_COPY_FILES += \
device/google/pantah/nfc/libse-gto-hal2.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libse-gto-hal2.conf device/google/pantah/nfc/libse-gto-hal2.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libse-gto-hal2.conf
DEVICE_MANIFEST_FILE += \ DEVICE_MANIFEST_FILE += \
device/google/pantah/nfc/manifest_nfc.xml \
device/google/pantah/nfc/manifest_se.xml device/google/pantah/nfc/manifest_se.xml
# Thermal Config # Thermal Config

3
device-ravenclaw.mk
View file

@ -65,7 +65,7 @@ PRODUCT_COPY_FILES += \
PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \
NfcNci \ NfcNci \
Tag \ Tag \
android.hardware.nfc-service.st android.hardware.nfc@1.2-service.st
# SecureElement # SecureElement
PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \
@ -79,6 +79,7 @@ PRODUCT_COPY_FILES += \
device/google/pantah/nfc/libse-gto-hal2.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libse-gto-hal2.conf device/google/pantah/nfc/libse-gto-hal2.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libse-gto-hal2.conf
DEVICE_MANIFEST_FILE += \ DEVICE_MANIFEST_FILE += \
device/google/pantah/nfc/manifest_nfc.xml \
device/google/pantah/nfc/manifest_se.xml device/google/pantah/nfc/manifest_se.xml
# Thermal Config # Thermal Config

9
manifest.xml
View file

@ -113,6 +113,15 @@
<transport>hwbinder</transport> <transport>hwbinder</transport>
<fqname>@1.3::IDevice/google-edgetpu</fqname> <fqname>@1.3::IDevice/google-edgetpu</fqname>
</hal> </hal>
<hal format="hidl">
<name>android.hardware.nfc</name>
<transport>hwbinder</transport>
<version>1.2</version>
<interface>
<name>INfc</name>
<instance>default</instance>
</interface>
</hal>
<hal format="hidl"> <hal format="hidl">
<name>android.hardware.health</name> <name>android.hardware.health</name>
<transport>hwbinder</transport> <transport>hwbinder</transport>

4
nfc/libnfc-hal-st-proto1.conf
View file

@ -60,8 +60,8 @@ PRESENCE_CHECK_ALGORITHM=5
NCI_HAL_MODULE="nfc_nci.st21nfc" NCI_HAL_MODULE="nfc_nci.st21nfc"
############################################################################### ###############################################################################
# Allow list to be set at startup. # White list to be set at startup.
DEVICE_HOST_ALLOW_LIST={02:C0} DEVICE_HOST_WHITE_LIST={02:C0}
############################################################################### ###############################################################################
# BAIL OUT value for P2P # BAIL OUT value for P2P

4
nfc/libnfc-hal-st.conf
View file

@ -60,8 +60,8 @@ PRESENCE_CHECK_ALGORITHM=5
NCI_HAL_MODULE="nfc_nci.st21nfc" NCI_HAL_MODULE="nfc_nci.st21nfc"
############################################################################### ###############################################################################
# Allow list to be set at startup. # White list to be set at startup.
DEVICE_HOST_ALLOW_LIST={02:C0} DEVICE_HOST_WHITE_LIST={02:C0}
############################################################################### ###############################################################################
# BAIL OUT value for P2P # BAIL OUT value for P2P