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

Switch NFC from HIDL to AIDL

Browse source 
Bug: 216290344
Test: atest NfcNciInstrumentationTests
Test: atest VtsAidlHalNfcTargetTest
Change-Id: Ifde6ab418a18a10b11911cd2e8459f769587f685
This commit is contained in:
George Chang 2022-03-30 22:13:09 +08:00
parent 26579ef536
commit 91a40969df
7 changed files with 10 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

3
device-oriole.mk
View file

@ -116,7 +116,7 @@ PRODUCT_COPY_FILES += \
PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \
NfcNci \ NfcNci \
Tag \ Tag \
android.hardware.nfc@1.2-service.st android.hardware.nfc-service.st
# SecureElement # SecureElement
PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \
@ -130,7 +130,6 @@ PRODUCT_COPY_FILES += \
device/google/raviole/nfc/libse-gto-hal2.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libse-gto-hal2.conf device/google/raviole/nfc/libse-gto-hal2.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libse-gto-hal2.conf
DEVICE_MANIFEST_FILE += \ DEVICE_MANIFEST_FILE += \
device/google/raviole/nfc/manifest_nfc.xml \
device/google/raviole/nfc/manifest_se.xml device/google/raviole/nfc/manifest_se.xml
# Vibrator HAL # Vibrator HAL

3
device-raven.mk
View file

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

3
device-slider.mk
View file

@ -84,7 +84,7 @@ PRODUCT_COPY_FILES += \
PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \
NfcNci \ NfcNci \
Tag \ Tag \
android.hardware.nfc@1.2-service.st android.hardware.nfc-service.st
# SecureElement # SecureElement
PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \
@ -97,7 +97,6 @@ PRODUCT_COPY_FILES += \
device/google/raviole/nfc/libse-gto-hal2.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libse-gto-hal2.conf device/google/raviole/nfc/libse-gto-hal2.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libse-gto-hal2.conf
DEVICE_MANIFEST_FILE += \ DEVICE_MANIFEST_FILE += \
device/google/raviole/nfc/manifest_nfc.xml \
device/google/raviole/nfc/manifest_se.xml device/google/raviole/nfc/manifest_se.xml
# PowerStats HAL # PowerStats HAL

5
device-whitefin.mk
View file

@ -76,10 +76,7 @@ PRODUCT_COPY_FILES += \
PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \
NfcNci \ NfcNci \
Tag \ Tag \
android.hardware.nfc@1.2-service.st android.hardware.nfc-service.st
DEVICE_MANIFEST_FILE += \
device/google/raviole/nfc/manifest_nfc.xml
# PowerStats HAL # PowerStats HAL
PRODUCT_SOONG_NAMESPACES += device/google/raviole/powerstats/whitefin PRODUCT_SOONG_NAMESPACES += device/google/raviole/powerstats/whitefin

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

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

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

@ -64,8 +64,8 @@ PRESENCE_CHECK_ALGORITHM=5
NCI_HAL_MODULE="nfc_nci.st21nfc" NCI_HAL_MODULE="nfc_nci.st21nfc"
############################################################################### ###############################################################################
# White list to be set at startup. # Allow list to be set at startup.
DEVICE_HOST_WHITE_LIST={02:C0} DEVICE_HOST_ALLOW_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"
############################################################################### ###############################################################################
# White list to be set at startup. # Allow list to be set at startup.
DEVICE_HOST_WHITE_LIST={02:C0} DEVICE_HOST_ALLOW_LIST={02:C0}
############################################################################### ###############################################################################
# BAIL OUT value for P2P # BAIL OUT value for P2P