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

Commit 0eb003a9 authored by David Duarte's avatar David Duarte Committed by Gerrit Code Review
Browse files

Merge "hearing_aid: Use proper type for is_acceptlisted" into main

parents b9a990f0 7be2ee77

system/bta/hearing_aid/hearing_aid.cc

+2 −2
Original line number Diff line number Diff line
@@ -424,7 +424,7 @@ class HearingAidImpl : public HearingAid { 
    BTA_GATTC_Open(gatt_if, address, BTM_BLE_BKG_CONNECT_ALLOW_LIST, false);

  }



  void AddFromStorage(const HearingDevice& dev_info, uint16_t is_acceptlisted) {

  void AddFromStorage(const HearingDevice& dev_info, bool is_acceptlisted) {

    LOG_DEBUG("%s, hiSyncId=%s, isAcceptlisted=%u",

              ADDRESS_TO_LOGGABLE_CSTR(dev_info.address),

              loghex(dev_info.hi_sync_id).c_str(), is_acceptlisted);
@@ -2096,7 +2096,7 @@ void HearingAid::SetVolume(int8_t volume) { 
}



void HearingAid::AddFromStorage(const HearingDevice& dev_info,

                                uint16_t is_acceptlisted) {

                                bool is_acceptlisted) {

  if (!instance) {

    LOG_ERROR("Not initialized yet");

  }

system/bta/include/bta_hearing_aid_api.h

+1 −1
Original line number Diff line number Diff line
@@ -239,7 +239,7 @@ class HearingAid { 
  static void DebugDump(int fd);



  static void AddFromStorage(const HearingDevice& dev_info,

                             uint16_t is_acceptlisted);

                             bool is_acceptlisted);



  static int GetDeviceCount();

system/btif/src/btif_profile_storage.cc

+1 −1
Original line number Diff line number Diff line
@@ -440,7 +440,7 @@ void btif_storage_load_bonded_hearing_aids() { 
    if (btif_config_get_int(name, HEARING_AID_PREPARATION_DELAY, &value))

      preparation_delay = value;



    uint16_t is_acceptlisted = 0;

    bool is_acceptlisted = false;

    if (btif_config_get_int(name, HEARING_AID_IS_ACCEPTLISTED, &value))

      is_acceptlisted = value;

system/test/mock/mock_bta_hearing_aid.cc

+1 −1
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ int HearingAid::GetDeviceCount() { 
}



void HearingAid::AddFromStorage(const HearingDevice& dev_info,

                                uint16_t is_acceptlisted) {

                                bool is_acceptlisted) {

  inc_func_call_count(__func__);

}