Snap for 8671920 from e8712cc5c1
to tm-qpr1-release
Change-Id: Ibf13ab2d8957253b4a2c5d1ac0f43cde8085f08f
This commit is contained in:
commit
23a9b55cc2
7 changed files with 12 additions and 18 deletions
|
@ -117,7 +117,7 @@ PRODUCT_COPY_FILES += \
|
|||
PRODUCT_PACKAGES += \
|
||||
NfcNci \
|
||||
Tag \
|
||||
android.hardware.nfc@1.2-service.st
|
||||
android.hardware.nfc-service.st
|
||||
|
||||
# SecureElement
|
||||
PRODUCT_PACKAGES += \
|
||||
|
@ -131,7 +131,6 @@ 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
|
||||
|
||||
# Vibrator HAL
|
||||
|
@ -165,7 +164,7 @@ endif
|
|||
|
||||
# Increment the SVN for any official public releases
|
||||
PRODUCT_VENDOR_PROPERTIES += \
|
||||
ro.vendor.build.svn=29
|
||||
ro.vendor.build.svn=31
|
||||
|
||||
# Set support hide display cutout feature
|
||||
PRODUCT_PRODUCT_PROPERTIES += \
|
||||
|
|
|
@ -132,7 +132,7 @@ endif
|
|||
PRODUCT_PACKAGES += \
|
||||
NfcNci \
|
||||
Tag \
|
||||
android.hardware.nfc@1.2-service.st
|
||||
android.hardware.nfc-service.st
|
||||
|
||||
# SecureElement
|
||||
PRODUCT_PACKAGES += \
|
||||
|
@ -146,7 +146,6 @@ 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
|
||||
|
||||
|
||||
|
@ -178,7 +177,7 @@ endif
|
|||
|
||||
# Increment the SVN for any official public releases
|
||||
PRODUCT_VENDOR_PROPERTIES += \
|
||||
ro.vendor.build.svn=29
|
||||
ro.vendor.build.svn=31
|
||||
|
||||
# Set support hide display cutout feature
|
||||
PRODUCT_PRODUCT_PROPERTIES += \
|
||||
|
|
|
@ -84,7 +84,7 @@ PRODUCT_COPY_FILES += \
|
|||
PRODUCT_PACKAGES += \
|
||||
NfcNci \
|
||||
Tag \
|
||||
android.hardware.nfc@1.2-service.st
|
||||
android.hardware.nfc-service.st
|
||||
|
||||
# SecureElement
|
||||
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_MANIFEST_FILE += \
|
||||
device/google/raviole/nfc/manifest_nfc.xml \
|
||||
device/google/raviole/nfc/manifest_se.xml
|
||||
|
||||
# PowerStats HAL
|
||||
|
|
|
@ -76,10 +76,7 @@ PRODUCT_COPY_FILES += \
|
|||
PRODUCT_PACKAGES += \
|
||||
NfcNci \
|
||||
Tag \
|
||||
android.hardware.nfc@1.2-service.st
|
||||
|
||||
DEVICE_MANIFEST_FILE += \
|
||||
device/google/raviole/nfc/manifest_nfc.xml
|
||||
android.hardware.nfc-service.st
|
||||
|
||||
# PowerStats HAL
|
||||
PRODUCT_SOONG_NAMESPACES += device/google/raviole/powerstats/whitefin
|
||||
|
|
|
@ -60,8 +60,8 @@ PRESENCE_CHECK_ALGORITHM=5
|
|||
NCI_HAL_MODULE="nfc_nci.st21nfc"
|
||||
|
||||
###############################################################################
|
||||
# White list to be set at startup.
|
||||
DEVICE_HOST_WHITE_LIST={02:C0}
|
||||
# Allow list to be set at startup.
|
||||
DEVICE_HOST_ALLOW_LIST={02:C0}
|
||||
|
||||
###############################################################################
|
||||
# BAIL OUT value for P2P
|
||||
|
|
|
@ -64,8 +64,8 @@ PRESENCE_CHECK_ALGORITHM=5
|
|||
NCI_HAL_MODULE="nfc_nci.st21nfc"
|
||||
|
||||
###############################################################################
|
||||
# White list to be set at startup.
|
||||
DEVICE_HOST_WHITE_LIST={02:C0}
|
||||
# Allow list to be set at startup.
|
||||
DEVICE_HOST_ALLOW_LIST={02:C0}
|
||||
|
||||
###############################################################################
|
||||
# BAIL OUT value for P2P
|
||||
|
|
|
@ -60,8 +60,8 @@ PRESENCE_CHECK_ALGORITHM=5
|
|||
NCI_HAL_MODULE="nfc_nci.st21nfc"
|
||||
|
||||
###############################################################################
|
||||
# White list to be set at startup.
|
||||
DEVICE_HOST_WHITE_LIST={02:C0}
|
||||
# Allow list to be set at startup.
|
||||
DEVICE_HOST_ALLOW_LIST={02:C0}
|
||||
|
||||
###############################################################################
|
||||
# BAIL OUT value for P2P
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue