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

Commit a8c125da authored by Rongxuan Liu's avatar Rongxuan Liu Committed by Automerger Merge Worker
Browse files

Merge "le_audio: Don't clear sink metadata context on monitor mode change"... 

Merge "le_audio: Don't clear sink metadata context on monitor mode change" into main am: e7ceeb48 am: 4ecf5c77

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



Change-Id: I6041973f37be40ee03365c72b512f6fa3db66ad0
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 3aa2c068 4ecf5c77

system/bta/le_audio/client.cc

+1 −5
Original line number Original line Diff line number Diff line
@@ -1376,11 +1376,7 @@ public: 
       * before group activation (active group context would take care of

       * before group activation (active group context would take care of

       * Sink HAL client cleanup).

       * Sink HAL client cleanup).

       */

       */

      if (com::android::bluetooth::flags::leaudio_use_audio_recording_listener()) {

      if (!com::android::bluetooth::flags::leaudio_use_audio_recording_listener()) {

        if (sink_monitor_mode_ && !enable) {

          local_metadata_context_types_.sink.clear();

        }

      } else {

        if (sink_monitor_mode_ && !enable && le_audio_sink_hal_client_ &&

        if (sink_monitor_mode_ && !enable && le_audio_sink_hal_client_ &&

            active_group_id_ == bluetooth::groups::kGroupUnknown) {

            active_group_id_ == bluetooth::groups::kGroupUnknown) {

          local_metadata_context_types_.sink.clear();

          local_metadata_context_types_.sink.clear();