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

Commit 63e83689 authored by Łukasz Rymanowski's avatar Łukasz Rymanowski Committed by Automerger Merge Worker
Browse files

Merge "leaudio: Fix crash when data path is removed while ACL is disconnected"... 

Merge "leaudio: Fix crash when data path is removed while ACL is disconnected" am: acbd65a3 am: 27334272

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



Change-Id: Ice0edb9adb0a23c9d03123d8509b17df6e649463
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b445a7e5 27334272

system/bta/le_audio/client.cc

+17 −0
Original line number Diff line number Diff line
@@ -3690,6 +3690,12 @@ class LeAudioClientImpl : public LeAudioClient { 
                             uint8_t cig_id) {

    LeAudioDevice* leAudioDevice =

        leAudioDevices_.FindByCisConnHdl(cig_id, conn_handle);

    /* In case device has been disconnected before data path was setup */

    if (!leAudioDevice) {

      LOG_WARN("Device for CIG %d and using cis_handle 0x%04x is disconnected.",

               cig_id, conn_handle);

      return;

    }

    LeAudioDeviceGroup* group = aseGroups_.FindById(leAudioDevice->group_id_);



    instance->groupStateMachine_->ProcessHciNotifSetupIsoDataPath(
@@ -3700,6 +3706,17 @@ class LeAudioClientImpl : public LeAudioClient { 
                              uint8_t cig_id) {

    LeAudioDevice* leAudioDevice =

        leAudioDevices_.FindByCisConnHdl(cig_id, conn_handle);



    /* If CIS has been disconnected just before ACL being disconnected by the

     * remote device, leAudioDevice might be already cleared i.e. has no

     * information about conn_handle, when the data path remove compete arrives.

     */

    if (!leAudioDevice) {

      LOG_WARN("Device for CIG %d and using cis_handle 0x%04x is disconnected.",

               cig_id, conn_handle);

      return;

    }



    LeAudioDeviceGroup* group = aseGroups_.FindById(leAudioDevice->group_id_);



    instance->groupStateMachine_->ProcessHciNotifRemoveIsoDataPath(