Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 56328122 authored by Jakub Pawłowski's avatar Jakub Pawłowski Committed by Automerger Merge Worker
Browse files

Merge "Use address, not address with type when writing to storage." into main am: fb721fae 

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/3033872



Change-Id: I95141f1c9c4614d6248f40c505d13ddf8efb5376
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 154e008a fb721fae

system/btif/co/bta_hh_co.cc

+3 −3
Original line number Diff line number Diff line
@@ -780,7 +780,7 @@ void bta_hh_le_co_rpt_info(const tAclLinkSpec& link_spec, 
                           UNUSED_ATTR uint8_t app_id) {

  unsigned idx = 0;



  std::string addrstr = link_spec.addrt.ToString();

  std::string addrstr = link_spec.addrt.bda.ToString();

  const char* bdstr = addrstr.c_str();



  size_t len = btif_config_get_bin_length(bdstr, BTIF_STORAGE_KEY_HID_REPORT);
@@ -821,7 +821,7 @@ void bta_hh_le_co_rpt_info(const tAclLinkSpec& link_spec, 
tBTA_HH_RPT_CACHE_ENTRY* bta_hh_le_co_cache_load(const tAclLinkSpec& link_spec,

                                                 uint8_t* p_num_rpt,

                                                 UNUSED_ATTR uint8_t app_id) {

  std::string addrstr = link_spec.addrt.ToString();

  std::string addrstr = link_spec.addrt.bda.ToString();

  const char* bdstr = addrstr.c_str();



  size_t len = btif_config_get_bin_length(bdstr, BTIF_STORAGE_KEY_HID_REPORT);
@@ -861,7 +861,7 @@ tBTA_HH_RPT_CACHE_ENTRY* bta_hh_le_co_cache_load(const tAclLinkSpec& link_spec, 
 ******************************************************************************/

void bta_hh_le_co_reset_rpt_cache(const tAclLinkSpec& link_spec,

                                  UNUSED_ATTR uint8_t app_id) {

  std::string addrstr = link_spec.addrt.ToString();

  std::string addrstr = link_spec.addrt.bda.ToString();

  const char* bdstr = addrstr.c_str();



  btif_config_remove(bdstr, BTIF_STORAGE_KEY_HID_REPORT);