From d23436056fb23d1830905eee903ee413cb2b11e9 Mon Sep 17 00:00:00 2001 From: George Chang Date: Tue, 4 Jul 2023 11:06:31 +0800 Subject: [PATCH 1/3] [NFC] Enable STNFC_REMOTE_FIELD_TIMER Bug: 280542396 Test: 288836849 Test: manually force external field on Change-Id: I4cb0facf71755f023b7b7f03c6c12075f06b4c6d --- nfc/libnfc-hal-st.conf | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/nfc/libnfc-hal-st.conf b/nfc/libnfc-hal-st.conf index 2700a20..442e785 100644 --- a/nfc/libnfc-hal-st.conf +++ b/nfc/libnfc-hal-st.conf @@ -147,6 +147,12 @@ DEFAULT_ISODEP_ROUTE=0x00 # disable 0x00 default value STNFC_CONTROL_CLK=0x00 +############################################################################### +# Configure the Field on timer +# enable 0x01 +# disable 0x00 default value +STNFC_REMOTE_FIELD_TIMER=0x01 + ############################################################################### # Configure the ACTIVE_RW timer # Default 0x00, set 0x01 to enable it From 1827d716bb69ac073c0f916bc3a5520e79d4ae3b Mon Sep 17 00:00:00 2001 From: Eva Tsai Date: Wed, 5 Jul 2023 15:04:34 +0800 Subject: [PATCH 2/3] Add SB3 UW Camera FW update tool Bug: 289904964 Bug: 289904357 Bug: 289055814 Test: Build Pass Change-Id: I3e986eeecbb124aed99aeea9582fda83626ad324 --- factory_husky.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/factory_husky.mk b/factory_husky.mk index 54cbdd7..3da26f5 100644 --- a/factory_husky.mk +++ b/factory_husky.mk @@ -31,4 +31,4 @@ PRODUCT_PROPERTY_OVERRIDES += \ ro.vendor.bluetooth.evb_bdaddr="22:22:22:33:44:55" # Factory binaries of camera -PRODUCT_PACKAGES += fatp_hk3sb3_wide_hat_tool fatp_hk3_tele_hat_tool fatp_hk3_ultrawide_hat_tool fatp_hk3_front_hat_tool factory_hk3sb3_main_cam_decompress_test +PRODUCT_PACKAGES += fatp_hk3sb3_wide_hat_tool fatp_hk3_tele_hat_tool fatp_hk3_ultrawide_hat_tool fatp_hk3_front_hat_tool factory_hk3sb3_main_cam_decompress_test sb3_ultrawide_af_fw_update From fb6e170ba38a1626a0c465726bf61c85343b2005 Mon Sep 17 00:00:00 2001 From: Eva Tsai Date: Wed, 5 Jul 2023 22:24:22 +0800 Subject: [PATCH 3/3] Move sb3_ultrawide_af_fw_update to factory_shiba.mk Bug: 289904964 Bug: 289904357 Bug: 289055814 Test: Build Pass Change-Id: I8300eebf835a08c3243deb762702df21e1c7c13d --- factory_husky.mk | 2 +- factory_shiba.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/factory_husky.mk b/factory_husky.mk index 3da26f5..54cbdd7 100644 --- a/factory_husky.mk +++ b/factory_husky.mk @@ -31,4 +31,4 @@ PRODUCT_PROPERTY_OVERRIDES += \ ro.vendor.bluetooth.evb_bdaddr="22:22:22:33:44:55" # Factory binaries of camera -PRODUCT_PACKAGES += fatp_hk3sb3_wide_hat_tool fatp_hk3_tele_hat_tool fatp_hk3_ultrawide_hat_tool fatp_hk3_front_hat_tool factory_hk3sb3_main_cam_decompress_test sb3_ultrawide_af_fw_update +PRODUCT_PACKAGES += fatp_hk3sb3_wide_hat_tool fatp_hk3_tele_hat_tool fatp_hk3_ultrawide_hat_tool fatp_hk3_front_hat_tool factory_hk3sb3_main_cam_decompress_test diff --git a/factory_shiba.mk b/factory_shiba.mk index b963358..365a2f1 100644 --- a/factory_shiba.mk +++ b/factory_shiba.mk @@ -31,4 +31,4 @@ PRODUCT_PROPERTY_OVERRIDES += \ ro.vendor.bluetooth.evb_bdaddr="22:22:22:33:44:55" # Factory binaries of camera -PRODUCT_PACKAGES += fatp_hk3sb3_wide_hat_tool fatp_sb3_ultrawide_hat_tool factory_hk3sb3_main_cam_decompress_test +PRODUCT_PACKAGES += fatp_hk3sb3_wide_hat_tool fatp_sb3_ultrawide_hat_tool factory_hk3sb3_main_cam_decompress_test sb3_ultrawide_af_fw_update