Revert "Switch NFC from HIDL to AIDL" am: 33af5d261f
Original change: https://android-review.googlesource.com/c/device/google/raviole/+/2098184 Change-Id: I55de2f65461cd48800ad5eadb9bb93e86cb60ee6 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
commit
bd80b494e4
7 changed files with 16 additions and 10 deletions
|
@ -114,7 +114,7 @@ PRODUCT_COPY_FILES += \
|
|||
PRODUCT_PACKAGES += \
|
||||
NfcNci \
|
||||
Tag \
|
||||
android.hardware.nfc-service.st
|
||||
android.hardware.nfc@1.2-service.st
|
||||
|
||||
# SecureElement
|
||||
PRODUCT_PACKAGES += \
|
||||
|
@ -126,6 +126,7 @@ PRODUCT_COPY_FILES += \
|
|||
device/google/raviole/nfc/libse-gto-hal.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libse-gto-hal.conf
|
||||
|
||||
DEVICE_MANIFEST_FILE += \
|
||||
device/google/raviole/nfc/manifest_nfc.xml \
|
||||
device/google/raviole/nfc/manifest_se.xml
|
||||
|
||||
# Vibrator HAL
|
||||
|
|
|
@ -129,7 +129,7 @@ endif
|
|||
PRODUCT_PACKAGES += \
|
||||
NfcNci \
|
||||
Tag \
|
||||
android.hardware.nfc-service.st
|
||||
android.hardware.nfc@1.2-service.st
|
||||
|
||||
# SecureElement
|
||||
PRODUCT_PACKAGES += \
|
||||
|
@ -141,6 +141,7 @@ PRODUCT_COPY_FILES += \
|
|||
device/google/raviole/nfc/libse-gto-hal.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libse-gto-hal.conf
|
||||
|
||||
DEVICE_MANIFEST_FILE += \
|
||||
device/google/raviole/nfc/manifest_nfc.xml \
|
||||
device/google/raviole/nfc/manifest_se.xml
|
||||
|
||||
# Vibrator HAL
|
||||
|
|
|
@ -83,7 +83,7 @@ PRODUCT_COPY_FILES += \
|
|||
PRODUCT_PACKAGES += \
|
||||
NfcNci \
|
||||
Tag \
|
||||
android.hardware.nfc-service.st
|
||||
android.hardware.nfc@1.2-service.st
|
||||
|
||||
# SecureElement
|
||||
PRODUCT_PACKAGES += \
|
||||
|
@ -96,6 +96,7 @@ PRODUCT_COPY_FILES += \
|
|||
device/google/raviole/nfc/libse-gto-hal2.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libse-gto-hal2.conf
|
||||
|
||||
DEVICE_MANIFEST_FILE += \
|
||||
device/google/raviole/nfc/manifest_nfc.xml \
|
||||
device/google/raviole/nfc/manifest_se.xml
|
||||
|
||||
# PowerStats HAL
|
||||
|
|
|
@ -75,7 +75,10 @@ PRODUCT_COPY_FILES += \
|
|||
PRODUCT_PACKAGES += \
|
||||
NfcNci \
|
||||
Tag \
|
||||
android.hardware.nfc-service.st
|
||||
android.hardware.nfc@1.2-service.st
|
||||
|
||||
DEVICE_MANIFEST_FILE += \
|
||||
device/google/raviole/nfc/manifest_nfc.xml
|
||||
|
||||
# PowerStats HAL
|
||||
PRODUCT_SOONG_NAMESPACES += device/google/raviole/powerstats/whitefin
|
||||
|
|
|
@ -60,8 +60,8 @@ PRESENCE_CHECK_ALGORITHM=5
|
|||
NCI_HAL_MODULE="nfc_nci.st21nfc"
|
||||
|
||||
###############################################################################
|
||||
# Allow list to be set at startup.
|
||||
DEVICE_HOST_ALLOW_LIST={02:C0}
|
||||
# White list to be set at startup.
|
||||
DEVICE_HOST_WHITE_LIST={02:C0}
|
||||
|
||||
###############################################################################
|
||||
# BAIL OUT value for P2P
|
||||
|
|
|
@ -64,8 +64,8 @@ PRESENCE_CHECK_ALGORITHM=5
|
|||
NCI_HAL_MODULE="nfc_nci.st21nfc"
|
||||
|
||||
###############################################################################
|
||||
# Allow list to be set at startup.
|
||||
DEVICE_HOST_ALLOW_LIST={02:C0}
|
||||
# White list to be set at startup.
|
||||
DEVICE_HOST_WHITE_LIST={02:C0}
|
||||
|
||||
###############################################################################
|
||||
# BAIL OUT value for P2P
|
||||
|
|
|
@ -60,8 +60,8 @@ PRESENCE_CHECK_ALGORITHM=5
|
|||
NCI_HAL_MODULE="nfc_nci.st21nfc"
|
||||
|
||||
###############################################################################
|
||||
# Allow list to be set at startup.
|
||||
DEVICE_HOST_ALLOW_LIST={02:C0}
|
||||
# White list to be set at startup.
|
||||
DEVICE_HOST_WHITE_LIST={02:C0}
|
||||
|
||||
###############################################################################
|
||||
# BAIL OUT value for P2P
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue