diff --git a/doc/nrf/links.txt b/doc/nrf/links.txt index b633da73da5e..023fbc9726fe 100644 --- a/doc/nrf/links.txt +++ b/doc/nrf/links.txt @@ -31,6 +31,7 @@ .. _`Zephyr pull request #29618`: https://github.com/zephyrproject-rtos/zephyr/pull/29618 .. _`Zephyr issue #27356`: https://github.com/zephyrproject-rtos/zephyr/issues/27356 .. _`Zephyr issue #38516`: https://github.com/zephyrproject-rtos/zephyr/issues/38516 +.. _`Zephyr issue #61033`: https://github.com/zephyrproject-rtos/zephyr/issues/61033 .. _`Zephyr SDK`: https://github.com/zephyrproject-rtos/sdk-ng/releases .. _`sdk-mcuboot`: https://github.com/nrfconnect/sdk-mcuboot diff --git a/doc/nrf/releases_and_maturity/releases/release-notes-changelog.rst b/doc/nrf/releases_and_maturity/releases/release-notes-changelog.rst index ccc1fd7a5e91..4f354bdc1b44 100644 --- a/doc/nrf/releases_and_maturity/releases/release-notes-changelog.rst +++ b/doc/nrf/releases_and_maturity/releases/release-notes-changelog.rst @@ -274,6 +274,10 @@ Bluetooth samples * Fixed an interoperability issue with iOS devices by setting the report IDs of HID input and output reports to zero. +* :ref:`peripheral_fast_pair` sample: + + * Disabled the :kconfig:option:`CONFIG_BT_SETTINGS_CCC_LAZY_LOADING` Kconfig option as a workaround fix for the `Zephyr issue #61033`_. + Bluetooth mesh samples ---------------------- diff --git a/samples/bluetooth/peripheral_fast_pair/prj.conf b/samples/bluetooth/peripheral_fast_pair/prj.conf index 8b5cb72a24d1..0a15c764fcc9 100644 --- a/samples/bluetooth/peripheral_fast_pair/prj.conf +++ b/samples/bluetooth/peripheral_fast_pair/prj.conf @@ -52,6 +52,10 @@ CONFIG_BT_ADV_PROV_TX_POWER_CORRECTION_VAL=-14 # update which triggers an invalid procedure collision. CONFIG_BT_AUTO_PHY_UPDATE=n +# Disable CCC Lazy Loading as a workaround fix for the rebond issue that is present because of the +# following Zephyr issue: https://github.com/zephyrproject-rtos/zephyr/issues/61033. +CONFIG_BT_SETTINGS_CCC_LAZY_LOADING=n + CONFIG_BT_ID_MAX=1 CONFIG_BT_MAX_CONN=1 CONFIG_BT_MAX_PAIRED=8