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

Commit ceb76af2 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge changes I1028f24c,Iab547daa into main am: 7480a4c6 am: d28802b7 

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



Change-Id: I15bbe6ba8950a325ca4446672eb23a1c725ab51b
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents cf270acb d28802b7

system/bta/le_audio/client.cc

+2 −2
Original line number Diff line number Diff line
@@ -3935,9 +3935,9 @@ public: 


    log::debug(

            "active_group_id: {}\n audio_receiver_state: {}\n audio_sender_state: "

            "{}\n configuration_context_type_: {}\n group {}\n",

            "{}\n configuration_context_type_: {}\n",

            active_group_id_, audio_receiver_state_, audio_sender_state_,

            ToHexString(configuration_context_type_), group ? " exist " : " does not exist ");

            ToHexString(configuration_context_type_));



    switch (audio_sender_state_) {

      case AudioState::STARTED:

system/btif/src/btif_dm.cc

+1 −1
Original line number Diff line number Diff line
@@ -1326,7 +1326,7 @@ static void btif_dm_search_devices_evt(tBTA_DM_SEARCH_EVT event, tBTA_DM_SEARCH* 
    case BTA_DM_INQ_RES_EVT: {

      /* inquiry result */

      bt_bdname_t bdname;

      uint8_t remote_name_len;

      uint8_t remote_name_len = 0;

      uint8_t num_uuids = 0, max_num_uuid = 32;

      uint8_t uuid_list[32 * Uuid::kNumBytes16];