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

Commit 10d4a429 authored by Jakub Pawłowski's avatar Jakub Pawłowski Committed by Automerger Merge Worker
Browse files

Merge "leaudio: Store chosen configuration asap" am: 03ce7313 

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

Change-Id: I3904fde3332fe258163f40cc1e0c5a903014bade
parents 24197427 03ce7313

system/bta/le_audio/client.cc

+0 −3
Original line number Diff line number Diff line
@@ -2039,7 +2039,6 @@ class LeAudioClientImpl : public LeAudioClient { 
    stream_conf->sink_frame_duration_us = frame_duration_us;

    stream_conf->sink_octets_per_codec_frame = octets_per_frame;

    stream_conf->valid = true;

    stream_conf->conf = group->GetActiveConfiguration();



    LOG(INFO) << __func__ << " configuration: " << stream_conf->conf->name;
@@ -2204,8 +2203,6 @@ class LeAudioClientImpl : public LeAudioClient { 
        ase->codec_config.octets_per_codec_frame;

    stream_conf->valid = true;



    stream_conf->conf = group->GetActiveConfiguration();



    LOG(INFO) << __func__ << " Added CIS: " << +ase->cis_conn_hdl

              << " to stream. Allocation: "

              << +ase->codec_config.audio_channel_allocation

system/bta/le_audio/devices.cc

+5 −0
Original line number Diff line number Diff line
@@ -1156,6 +1156,11 @@ bool LeAudioDeviceGroup::Configure(LeAudioContextType context_type) { 
               << ", is in mismatch with cached active contexts";

    return false;

  }



  /* Store selected configuration at once it is chosen.

   * It might happen it will get unavailable in some point of time

   */

  stream_conf.conf = conf;

  return true;

}