Update raven SVN to 32 am: 402a8d4f74 am: 38a6d67436 am: 07ea56419c am: 092627e665
Original change: https://googleplex-android-review.googlesource.com/c/device/google/raviole/+/18919006
Change-Id: I3e4624dc4fd06e927fe75ea33dd16544658cf12b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/device-oriole.mk b/device-oriole.mk
index c52e57d..9f7bf39 100644
--- a/device-oriole.mk
+++ b/device-oriole.mk
@@ -117,7 +117,7 @@
PRODUCT_PACKAGES += \
NfcNci \
Tag \
- android.hardware.nfc@1.2-service.st
+ android.hardware.nfc-service.st
# SecureElement
PRODUCT_PACKAGES += \
@@ -131,7 +131,6 @@
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
diff --git a/device-raven.mk b/device-raven.mk
index d8363c7..db40c4c 100644
--- a/device-raven.mk
+++ b/device-raven.mk
@@ -132,7 +132,7 @@
PRODUCT_PACKAGES += \
NfcNci \
Tag \
- android.hardware.nfc@1.2-service.st
+ android.hardware.nfc-service.st
# SecureElement
PRODUCT_PACKAGES += \
@@ -146,7 +146,6 @@
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
diff --git a/device-slider.mk b/device-slider.mk
index bba1e52..a1662de 100644
--- a/device-slider.mk
+++ b/device-slider.mk
@@ -84,7 +84,7 @@
PRODUCT_PACKAGES += \
NfcNci \
Tag \
- android.hardware.nfc@1.2-service.st
+ android.hardware.nfc-service.st
# SecureElement
PRODUCT_PACKAGES += \
@@ -97,7 +97,6 @@
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
diff --git a/device-whitefin.mk b/device-whitefin.mk
index 6378046..df3ce52 100644
--- a/device-whitefin.mk
+++ b/device-whitefin.mk
@@ -76,10 +76,7 @@
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
diff --git a/nfc/libnfc-hal-st-debug.conf b/nfc/libnfc-hal-st-debug.conf
index 5fdaf5e..3b3e1ee 100644
--- a/nfc/libnfc-hal-st-debug.conf
+++ b/nfc/libnfc-hal-st-debug.conf
@@ -60,8 +60,8 @@
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
diff --git a/nfc/libnfc-hal-st-disable.conf b/nfc/libnfc-hal-st-disable.conf
index 2b455df..165665e 100644
--- a/nfc/libnfc-hal-st-disable.conf
+++ b/nfc/libnfc-hal-st-disable.conf
@@ -64,8 +64,8 @@
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
diff --git a/nfc/libnfc-hal-st.conf b/nfc/libnfc-hal-st.conf
index 0035a70..b7599c7 100644
--- a/nfc/libnfc-hal-st.conf
+++ b/nfc/libnfc-hal-st.conf
@@ -60,8 +60,8 @@
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