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

Commit 99e12bb0 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Parse all BT_PROPERTY_UUIDS to find hearing aid UUID"

parents a00b6497 9a40baa4

system/bta/include/bta_hearing_aid_api.h

+0 −2
Original line number Diff line number Diff line
@@ -29,8 +29,6 @@ 
#include "stack/include/gap_api.h"

#include "types/raw_address.h"



constexpr uint16_t HEARINGAID_MAX_NUM_UUIDS = 1;



constexpr uint16_t HA_INTERVAL_10_MS = 10;

constexpr uint16_t HA_INTERVAL_20_MS = 20;

system/btif/src/btif_profile_storage.cc

+3 −3
Original line number Diff line number Diff line
@@ -380,14 +380,14 @@ void btif_storage_load_bonded_hearing_aids() { 
  for (const auto& bd_addr : btif_config_get_paired_devices()) {

    const std::string& name = bd_addr.ToString();



    int size = STORAGE_UUID_STRING_SIZE * HEARINGAID_MAX_NUM_UUIDS;

    int size = STORAGE_UUID_STRING_SIZE * BT_MAX_NUM_UUIDS;

    char uuid_str[size];

    bool isHearingaidDevice = false;

    if (btif_config_get_str(name, BTIF_STORAGE_PATH_REMOTE_SERVICE, uuid_str,

                            &size)) {

      Uuid p_uuid[HEARINGAID_MAX_NUM_UUIDS];

      Uuid p_uuid[BT_MAX_NUM_UUIDS];

      size_t num_uuids =

          btif_split_uuids_string(uuid_str, p_uuid, HEARINGAID_MAX_NUM_UUIDS);

          btif_split_uuids_string(uuid_str, p_uuid, BT_MAX_NUM_UUIDS);

      for (size_t i = 0; i < num_uuids; i++) {

        if (p_uuid[i] == Uuid::FromString("FDF0")) {

          isHearingaidDevice = true;