From 495006966fe7219723ca8aba252d3e91080568ca Mon Sep 17 00:00:00 2001 From: George Chang Date: Wed, 30 Mar 2022 22:19:05 +0800 Subject: [PATCH 1/2] Switch NFC from HIDL to AIDL Bug: 216290344 Test: atest NfcNciInstrumentationTests Test: atest VtsAidlHalNfcTargetTest Merged-In: Ieeb194305eb4878c3ca07be8da20ebe6484aaed5 Change-Id: Ieeb194305eb4878c3ca07be8da20ebe6484aaed5 --- device-bluejay.mk | 3 +-- nfc/libnfc-hal-st-GB17L.conf | 4 ++-- nfc/libnfc-hal-st.conf | 4 ++-- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/device-bluejay.mk b/device-bluejay.mk index e9801b8..aced5b9 100644 --- a/device-bluejay.mk +++ b/device-bluejay.mk @@ -97,7 +97,7 @@ PRODUCT_COPY_FILES += \ PRODUCT_PACKAGES += \ NfcNci \ Tag \ - android.hardware.nfc@1.2-service.st + android.hardware.nfc-service.st # SecureElement 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_MANIFEST_FILE += \ - device/google/bluejay/nfc/manifest_nfc.xml \ device/google/bluejay/nfc/manifest_se_bluejay.xml # PowerStats HAL diff --git a/nfc/libnfc-hal-st-GB17L.conf b/nfc/libnfc-hal-st-GB17L.conf index ed77586..ef1a858 100644 --- a/nfc/libnfc-hal-st-GB17L.conf +++ b/nfc/libnfc-hal-st-GB17L.conf @@ -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 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 @@ 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 From 7c61de545e9bd68903b17d1325b1b9667de8fe17 Mon Sep 17 00:00:00 2001 From: Paul Scovanner Date: Tue, 31 May 2022 19:30:04 +0000 Subject: [PATCH 2/2] Update SVN to 5 Bug: 232157623 Change-Id: I7141b9a2e60093771b726d2f337377bbe482144f --- device-bluejay.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-bluejay.mk b/device-bluejay.mk index b918d11..e928741 100644 --- a/device-bluejay.mk +++ b/device-bluejay.mk @@ -119,7 +119,7 @@ PRODUCT_SOONG_NAMESPACES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=3 + ro.vendor.build.svn=5 # DCK properties based on target PRODUCT_PROPERTY_OVERRIDES += \