From e2c205b11ba314ab1f1ad1b4117741d0cf79dcd6 Mon Sep 17 00:00:00 2001 From: Paul Scovanner Date: Tue, 31 May 2022 19:27:04 +0000 Subject: [PATCH 1/5] Update Raviole SVN to 31 Bug: 232157623 Change-Id: I3bd635f4229f0332c8dd5dba0c3d1677535da99d --- device-oriole.mk | 2 +- device-raven.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/device-oriole.mk b/device-oriole.mk index 34648b6..ca4c732 100644 --- a/device-oriole.mk +++ b/device-oriole.mk @@ -165,7 +165,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 += \ diff --git a/device-raven.mk b/device-raven.mk index fb94ac4..4145e61 100644 --- a/device-raven.mk +++ b/device-raven.mk @@ -178,7 +178,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 += \ From e8712cc5c12be607d1c5bef6ef6662551a30892e Mon Sep 17 00:00:00 2001 From: George Chang Date: Wed, 30 Mar 2022 22:13:09 +0800 Subject: [PATCH 2/5] Switch NFC from HIDL to AIDL Bug: 216290344 Test: atest NfcNciInstrumentationTests Test: atest VtsAidlHalNfcTargetTest Merged-In: Ifde6ab418a18a10b11911cd2e8459f769587f685 Change-Id: Ifde6ab418a18a10b11911cd2e8459f769587f685 --- device-oriole.mk | 3 +-- device-raven.mk | 3 +-- device-slider.mk | 3 +-- device-whitefin.mk | 5 +---- nfc/libnfc-hal-st-debug.conf | 4 ++-- nfc/libnfc-hal-st-disable.conf | 4 ++-- nfc/libnfc-hal-st.conf | 4 ++-- 7 files changed, 10 insertions(+), 16 deletions(-) diff --git a/device-oriole.mk b/device-oriole.mk index ee728c3..5a5ab27 100644 --- a/device-oriole.mk +++ b/device-oriole.mk @@ -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 diff --git a/device-raven.mk b/device-raven.mk index b0300b3..bb42519 100644 --- a/device-raven.mk +++ b/device-raven.mk @@ -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 diff --git a/device-slider.mk b/device-slider.mk index 647ee73..631ee09 100644 --- a/device-slider.mk +++ b/device-slider.mk @@ -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 diff --git a/device-whitefin.mk b/device-whitefin.mk index 577092e..e55b62a 100644 --- a/device-whitefin.mk +++ b/device-whitefin.mk @@ -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 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 @@ 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-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 @@ 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 776917708de059d15266d7ee5a5c0c3b0a338939 Mon Sep 17 00:00:00 2001 From: George Chang Date: Wed, 30 Mar 2022 22:13:09 +0800 Subject: [PATCH 3/5] Switch NFC from HIDL to AIDL Bug: 216290344 Test: atest NfcNciInstrumentationTests Test: atest VtsAidlHalNfcTargetTest Merged-In: Ifde6ab418a18a10b11911cd2e8459f769587f685 Change-Id: Ifde6ab418a18a10b11911cd2e8459f769587f685 --- device-oriole.mk | 3 +-- device-raven.mk | 3 +-- device-slider.mk | 3 +-- device-whitefin.mk | 5 +---- nfc/libnfc-hal-st-debug.conf | 4 ++-- nfc/libnfc-hal-st-disable.conf | 4 ++-- nfc/libnfc-hal-st.conf | 4 ++-- 7 files changed, 10 insertions(+), 16 deletions(-) diff --git a/device-oriole.mk b/device-oriole.mk index ee728c3..5a5ab27 100644 --- a/device-oriole.mk +++ b/device-oriole.mk @@ -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 diff --git a/device-raven.mk b/device-raven.mk index b0300b3..bb42519 100644 --- a/device-raven.mk +++ b/device-raven.mk @@ -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 diff --git a/device-slider.mk b/device-slider.mk index 647ee73..631ee09 100644 --- a/device-slider.mk +++ b/device-slider.mk @@ -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 diff --git a/device-whitefin.mk b/device-whitefin.mk index 577092e..e55b62a 100644 --- a/device-whitefin.mk +++ b/device-whitefin.mk @@ -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 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 @@ 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-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 @@ 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 88b2efd74bf6f2aab6b9ac729b061e14317d895e Mon Sep 17 00:00:00 2001 From: Steve Berbary Date: Thu, 26 May 2022 23:19:13 +0000 Subject: [PATCH 4/5] [DO NOT MERGE] Update raven SVN to 30 Bug: 231380374 Change-Id: I9b819378787f80c6cd254abc968106b3dc57558a --- device-raven.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-raven.mk b/device-raven.mk index 1069aac..7972bd5 100644 --- a/device-raven.mk +++ b/device-raven.mk @@ -187,7 +187,7 @@ endif # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=29 + ro.vendor.build.svn=30 # Hide cutout overlays PRODUCT_PACKAGES += \ From c3b1a6ff862a1e87e6ff37f2aa9b3816872d753b Mon Sep 17 00:00:00 2001 From: Steve Berbary Date: Thu, 26 May 2022 23:17:26 +0000 Subject: [PATCH 5/5] [DO NOT MERGE] Update oriole SVN to 30 Bug: 231380374 Change-Id: I7e71f4663f8b07367b8f33e99bf28a23a9110259 --- device-oriole.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-oriole.mk b/device-oriole.mk index e95186c..d41b43d 100644 --- a/device-oriole.mk +++ b/device-oriole.mk @@ -175,7 +175,7 @@ endif # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=29 + ro.vendor.build.svn=30 # Hide cutout overlays PRODUCT_PACKAGES += \