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

Commit 7416642c authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "leaudio: Fix audio config notification to Java" into tm-d1-dev am: d943621c 

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



Change-Id: If0394312bce982037bac85e15b173b172f4e0595
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 4e822700 d943621c

system/bta/le_audio/client.cc

+16 −8
Original line number Diff line number Diff line
@@ -387,7 +387,7 @@ class LeAudioClientImpl : public LeAudioClient { 
      callbacks_->OnAudioConf(group->audio_directions_, group->group_id_,

                              group->snk_audio_locations_.to_ulong(),

                              group->src_audio_locations_.to_ulong(),

                              new_group_updated_contexts->to_ulong());

                              group->GetActiveContexts().to_ulong());

    }

  }
@@ -1120,9 +1120,13 @@ class LeAudioClientImpl : public LeAudioClient { 
       * Read of available context during initial attribute discovery.

       * Group would be assigned once service search is completed.

       */

      if (group)

        group->UpdateActiveContextsMap(leAudioDevice->GetAvailableContexts());



      if (group && group->UpdateActiveContextsMap(

                       leAudioDevice->GetAvailableContexts())) {

        callbacks_->OnAudioConf(group->audio_directions_, group->group_id_,

                                group->snk_audio_locations_.to_ulong(),

                                group->src_audio_locations_.to_ulong(),

                                group->GetActiveContexts().to_ulong());

      }

      return;

    }
@@ -1147,9 +1151,13 @@ class LeAudioClientImpl : public LeAudioClient { 
       * Read of available context during initial attribute discovery.

       * Group would be assigned once service search is completed.

       */

      if (group)

        group->UpdateActiveContextsMap(leAudioDevice->GetAvailableContexts());



      if (group && group->UpdateActiveContextsMap(

                       leAudioDevice->GetAvailableContexts())) {

        callbacks_->OnAudioConf(group->audio_directions_, group->group_id_,

                                group->snk_audio_locations_.to_ulong(),

                                group->src_audio_locations_.to_ulong(),

                                group->GetActiveContexts().to_ulong());

      }

      return;

    }
@@ -3537,7 +3545,7 @@ class LeAudioClientImpl : public LeAudioClient { 
        callbacks_->OnAudioConf(group->audio_directions_, group->group_id_,

                                group->snk_audio_locations_.to_ulong(),

                                group->src_audio_locations_.to_ulong(),

                                updated_contexts->to_ulong());

                                group->GetActiveContexts().to_ulong());

      }



      group->SetPendingUpdateAvailableContexts(std::nullopt);