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

Commit 378de4c2 authored by Jack He's avatar Jack He Committed by Automerger Merge Worker
Browse files

Merge changes I981f6c97,I45d326dc am: 094b2ad4 am: 64370993 

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



Change-Id: Ic720090110143dab31d979d2084a2100de70c4b1
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 65c0d2fb 64370993

system/bta/le_audio/devices.cc

+2 −2
Original line number Diff line number Diff line
@@ -2079,7 +2079,7 @@ struct ase* LeAudioDevice::GetAseToMatchBidirectionCis(struct ase* base_ase) { 
}



BidirectAsesPair LeAudioDevice::GetAsesByCisConnHdl(uint16_t conn_hdl) {

  BidirectAsesPair ases;

  BidirectAsesPair ases = {nullptr, nullptr};



  for (auto& ase : ases_) {

    if (ase.cis_conn_hdl == conn_hdl) {
@@ -2095,7 +2095,7 @@ BidirectAsesPair LeAudioDevice::GetAsesByCisConnHdl(uint16_t conn_hdl) { 
}



BidirectAsesPair LeAudioDevice::GetAsesByCisId(uint8_t cis_id) {

  BidirectAsesPair ases;

  BidirectAsesPair ases = {nullptr, nullptr};



  for (auto& ase : ases_) {

    if (ase.cis_id == cis_id) {

system/bta/le_audio/state_machine.cc

+1 −0
Original line number Diff line number Diff line
@@ -538,6 +538,7 @@ class LeAudioGroupStateMachineImpl : public LeAudioGroupStateMachine { 
    while (leAudioDevice != nullptr) {

      for (auto& ase : leAudioDevice->ases_) {

        ase.cis_id = le_audio::kInvalidCisId;

        ase.cis_conn_hdl = 0;

      }

      leAudioDevice = group->GetNextDevice(leAudioDevice);

    }