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

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

Merge "leaudio: Fix audio config notification to Java" am: 07327df7 am: 50eb450e 

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



Change-Id: Id18ef95ed181d6b15a52059fbf172b56bdacc400
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 96db427a 50eb450e

system/bta/le_audio/client.cc

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

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

                              group->snk_audio_locations_.to_ulong(),

                              group->snk_audio_locations_.to_ulong(),

                              group->src_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.

       * Read of available context during initial attribute discovery.

       * Group would be assigned once service search is completed.

       * Group would be assigned once service search is completed.

       */

       */

      if (group)

      if (group && group->UpdateActiveContextsMap(

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

                       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;

      return;

    }

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

       * Read of available context during initial attribute discovery.

       * Group would be assigned once service search is completed.

       * Group would be assigned once service search is completed.

       */

       */

      if (group)

      if (group && group->UpdateActiveContextsMap(

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

                       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;

      return;

    }

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

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

                                group->snk_audio_locations_.to_ulong(),

                                group->snk_audio_locations_.to_ulong(),

                                group->src_audio_locations_.to_ulong(),

                                group->src_audio_locations_.to_ulong(),

                                updated_contexts->to_ulong());

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

      }

      }





      group->SetPendingUpdateAvailableContexts(std::nullopt);

      group->SetPendingUpdateAvailableContexts(std::nullopt);