From 0b6fa5c33c037a9394604b57bc3407c7b3edfe87 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 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 b2d14c3..5ad014b 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 5a83cb4718c7d46fcf876cc2b129f3e7986fd4c5 Mon Sep 17 00:00:00 2001 From: William Tai Date: Thu, 5 May 2022 11:05:01 +0800 Subject: [PATCH 2/2] display: add primary display LHBM property Add primary display LHBM frames to reach peak brightness property. Bug: 231511867 Test: maually check /vendor/build.prop Change-Id: I0e05bfe48a28ec2ddf0f0c6bde5740be079ca59a --- device-bluejay.mk | 3 +++ 1 file changed, 3 insertions(+) diff --git a/device-bluejay.mk b/device-bluejay.mk index c102a29..30d9c16 100644 --- a/device-bluejay.mk +++ b/device-bluejay.mk @@ -135,6 +135,9 @@ PRODUCT_DEFAULT_PROPERTY_OVERRIDES += vendor.display.lbe.supported=1 PRODUCT_PACKAGES_DEBUG += \ sar_test +# Config of primary display frames to reach LHBM peak brightness +PRODUCT_DEFAULT_PROPERTY_OVERRIDES += vendor.primarydisplay.lhbm.frames_to_reach_peak_brightness=2 + # Bluetooth Tx power caps for bluejay PRODUCT_COPY_FILES += \ $(LOCAL_PATH)/bluetooth_power_limits.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits.csv \