Snap for 8671920 from 25925d0b84 to tm-qpr1-release

Change-Id: I4df46f8ca4b654340198397abc7150088f208d8b
This commit is contained in:
Android Build Coastguard Worker 2022-06-02 01:02:45 +00:00
commit 975613b1f1
3 changed files with 6 additions and 7 deletions

View file

@ -97,7 +97,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 += \
@ -109,7 +109,6 @@ PRODUCT_COPY_FILES += \
device/google/bluejay/nfc/libse-gto-hal.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libse-gto-hal.conf device/google/bluejay/nfc/libse-gto-hal.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libse-gto-hal.conf
DEVICE_MANIFEST_FILE += \ DEVICE_MANIFEST_FILE += \
device/google/bluejay/nfc/manifest_nfc.xml \
device/google/bluejay/nfc/manifest_se_bluejay.xml device/google/bluejay/nfc/manifest_se_bluejay.xml
# PowerStats HAL # PowerStats HAL
@ -119,7 +118,7 @@ PRODUCT_SOONG_NAMESPACES += \
# Increment the SVN for any official public releases # Increment the SVN for any official public releases
PRODUCT_VENDOR_PROPERTIES += \ PRODUCT_VENDOR_PROPERTIES += \
ro.vendor.build.svn=3 ro.vendor.build.svn=5
# DCK properties based on target # DCK properties based on target
PRODUCT_PROPERTY_OVERRIDES += \ PRODUCT_PROPERTY_OVERRIDES += \

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

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