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

Commit 4ec1fdb4 authored by Jakub Tyszkowski's avatar Jakub Tyszkowski Committed by Gerrit Code Review
Browse files

Merge changes If5994eee,I016ba718,I37908b9f 

* changes:
  LeAudio: Fix stream configurations duplicates and naming
  LeAudio: Fix unable to configure getting ready devices
  LeAudio: Adjust stream configurations
parents e500e189 f59a139a

system/bta/le_audio/audio_set_configurations.json

+20 −125
Original line number Diff line number Diff line
@@ -933,192 +933,97 @@ 
            "qos_config_name": ["VND_QoS_Config_R5_L12"]

        },

        {

            "name": "DualDev_OneChanStereoSnk_48_4_1_OneChanStereoSrc_32_2_1_Balanced_Reliability",

            "name": "DualDev_OneChanStereoSnk_48_4_OneChanStereoSrc_32_2_Balanced_Reliability",

            "codec_config_name": "DualDev_OneChanStereoSnk_48_4_OneChanStereoSrc_32_2",

            "qos_config_name": ["QoS_Config_Balanced_Reliability"]

        },

        {

            "name": "DualDev_OneChanStereoSnk_48_4_2_OneChanStereoSrc_32_2_2_Balanced_Reliability",

            "codec_config_name": "DualDev_OneChanStereoSnk_48_4_OneChanStereoSrc_32_2",

            "qos_config_name": ["QoS_Config_Balanced_Reliability"]

        },

        {

            "name": "DualDev_OneChanStereoSnk_48_4_1_OneChanStereoSrc_24_2_1_Balanced_Reliability",

            "name": "DualDev_OneChanStereoSnk_48_4_OneChanStereoSrc_24_2_Balanced_Reliability",

            "codec_config_name": "DualDev_OneChanStereoSnk_48_4_OneChanStereoSrc_24_2",

            "qos_config_name": ["QoS_Config_Balanced_Reliability"]

        },

        {

            "name": "DualDev_OneChanStereoSnk_48_4_2_OneChanStereoSrc_24_2_2_Balanced_Reliability",

            "codec_config_name": "DualDev_OneChanStereoSnk_48_4_OneChanStereoSrc_24_2",

            "qos_config_name": ["QoS_Config_Balanced_Reliability"]

        },

        {

            "name": "DualDev_OneChanStereoSnk_48_4_1_OneChanStereoSrc_16_2_1_Balanced_Reliability",

            "name": "DualDev_OneChanStereoSnk_48_4_OneChanStereoSrc_16_2_Balanced_Reliability",

            "codec_config_name": "DualDev_OneChanStereoSnk_48_4_OneChanStereoSrc_16_2",

            "qos_config_name": ["QoS_Config_Balanced_Reliability"]

        },

        {

            "name": "DualDev_OneChanStereoSnk_48_4_2_OneChanStereoSrc_16_2_2_Balanced_Reliability",

            "codec_config_name": "DualDev_OneChanStereoSnk_48_4_OneChanStereoSrc_16_2",

            "qos_config_name": ["QoS_Config_Balanced_Reliability"]

        },

        {

            "name": "DualDev_OneChanStereoSnk_48_4_1_OneChanMonoSrc_32_2_1_Balanced_Reliability",

            "codec_config_name": "DualDev_OneChanStereoSnk_48_4_OneChanMonoSrc_32_2",

            "qos_config_name": ["QoS_Config_Balanced_Reliability"]

        },

        {

            "name": "DualDev_OneChanStereoSnk_48_4_2_OneChanMonoSrc_32_2_2_Balanced_Reliability",

            "name": "DualDev_OneChanStereoSnk_48_4_OneChanMonoSrc_32_2_Balanced_Reliability",

            "codec_config_name": "DualDev_OneChanStereoSnk_48_4_OneChanMonoSrc_32_2",

            "qos_config_name": ["QoS_Config_Balanced_Reliability"]

        },

        {

            "name": "DualDev_OneChanStereoSnk_48_4_1_OneChanMonoSrc_24_2_1_Balanced_Reliability",

            "name": "DualDev_OneChanStereoSnk_48_4_OneChanMonoSrc_24_2_Balanced_Reliability",

            "codec_config_name": "DualDev_OneChanStereoSnk_48_4_OneChanMonoSrc_24_2",

            "qos_config_name": ["QoS_Config_Balanced_Reliability"]

        },

        {

            "name": "DualDev_OneChanStereoSnk_48_4_2_OneChanMonoSrc_24_2_2_Balanced_Reliability",

            "codec_config_name": "DualDev_OneChanStereoSnk_48_4_OneChanMonoSrc_24_2",

            "qos_config_name": ["QoS_Config_Balanced_Reliability"]

        },

        {

            "name": "DualDev_OneChanStereoSnk_48_4_1_OneChanMonoSrc_16_2_1_Balanced_Reliability",

            "codec_config_name": "DualDev_OneChanStereoSnk_48_4_OneChanMonoSrc_16_2",

            "qos_config_name": ["QoS_Config_Balanced_Reliability"]

        },

        {

            "name": "DualDev_OneChanStereoSnk_48_4_2_OneChanMonoSrc_16_2_2_Balanced_Reliability",

            "name": "DualDev_OneChanStereoSnk_48_4_OneChanMonoSrc_16_2_Balanced_Reliability",

            "codec_config_name": "DualDev_OneChanStereoSnk_48_4_OneChanMonoSrc_16_2",

            "qos_config_name": ["QoS_Config_Balanced_Reliability"]

        },

        {

            "name": "DualDev_OneChanDoubleStereoSnk_48_4_1_OneChanMonoSrc_32_2_1_Balanced_Reliability",

            "name": "DualDev_OneChanDoubleStereoSnk_48_4_OneChanMonoSrc_32_2_Balanced_Reliability",

            "codec_config_name": "DualDev_OneChanDoubleStereoSnk_48_4_OneChanMonoSrc_32_2",

            "qos_config_name": ["QoS_Config_Balanced_Reliability"]

        },

        {

            "name": "DualDev_OneChanDoubleStereoSnk_48_4_2_OneChanMonoSrc_32_2_2_Balanced_Reliability",

            "codec_config_name": "DualDev_OneChanDoubleStereoSnk_48_4_OneChanMonoSrc_32_2",

            "qos_config_name": ["QoS_Config_Balanced_Reliability"]

        },

        {

            "name": "DualDev_OneChanDoubleStereoSnk_48_4_1_OneChanMonoSrc_24_2_1_Balanced_Reliability",

            "codec_config_name": "DualDev_OneChanDoubleStereoSnk_48_4_OneChanMonoSrc_24_2",

            "qos_config_name": ["QoS_Config_Balanced_Reliability"]

        },

        {

            "name": "DualDev_OneChanDoubleStereoSnk_48_4_2_OneChanMonoSrc_24_2_2_Balanced_Reliability",

            "name": "DualDev_OneChanDoubleStereoSnk_48_4_OneChanMonoSrc_24_2_Balanced_Reliability",

            "codec_config_name": "DualDev_OneChanDoubleStereoSnk_48_4_OneChanMonoSrc_24_2",

            "qos_config_name": ["QoS_Config_Balanced_Reliability"]

        },

        {

            "name": "DualDev_OneChanDoubleStereoSnk_48_4_1_OneChanMonoSrc_16_2_1_Balanced_Reliability",

            "name": "DualDev_OneChanDoubleStereoSnk_48_4_OneChanMonoSrc_16_2_Balanced_Reliability",

            "codec_config_name": "DualDev_OneChanDoubleStereoSnk_48_4_OneChanMonoSrc_16_2",

            "qos_config_name": ["QoS_Config_Balanced_Reliability"]

        },

        {

            "name": "DualDev_OneChanDoubleStereoSnk_48_4_2_OneChanMonoSrc_16_2_2_Balanced_Reliability",

            "codec_config_name": "DualDev_OneChanDoubleStereoSnk_48_4_OneChanMonoSrc_16_2",

            "qos_config_name": ["QoS_Config_Balanced_Reliability"]

        },

        {

            "name": "SingleDev_TwoChanStereoSnk_48_4_1_TwoChanStereoSrc_32_2_1_Balanced_Reliability",

            "codec_config_name": "SingleDev_TwoChanStereoSnk_48_4_TwoChanStereoSrc_32_2",

            "qos_config_name": ["QoS_Config_Balanced_Reliability"]

        },

        {

            "name": "SingleDev_TwoChanStereoSnk_48_4_2_TwoChanStereoSrc_32_2_2_Balanced_Reliability",

            "name": "SingleDev_TwoChanStereoSnk_48_4_TwoChanStereoSrc_32_2_Balanced_Reliability",

            "codec_config_name": "SingleDev_TwoChanStereoSnk_48_4_TwoChanStereoSrc_32_2",

            "qos_config_name": ["QoS_Config_Balanced_Reliability"]

        },

        {

            "name": "SingleDev_TwoChanStereoSnk_48_4_1_TwoChanStereoSrc_24_2_1_Balanced_Reliability",

            "codec_config_name": "SingleDev_TwoChanStereoSnk_48_4_TwoChanStereoSrc_24_2",

            "qos_config_name": ["QoS_Config_Balanced_Reliability"]

        },

        {

            "name": "SingleDev_TwoChanStereoSnk_48_4_2_TwoChanStereoSrc_24_2_2_Balanced_Reliability",

            "name": "SingleDev_TwoChanStereoSnk_48_4_TwoChanStereoSrc_24_2_Balanced_Reliability",

            "codec_config_name": "SingleDev_TwoChanStereoSnk_48_4_TwoChanStereoSrc_24_2",

            "qos_config_name": ["QoS_Config_Balanced_Reliability"]

        },

        {

            "name": "SingleDev_TwoChanStereoSnk_48_4_1_TwoChanStereoSrc_16_2_1_Balanced_Reliability",

            "codec_config_name": "SingleDev_TwoChanStereoSnk_48_4_TwoChanStereoSrc_16_2",

            "qos_config_name": ["QoS_Config_Balanced_Reliability"]

        },

        {

            "name": "SingleDev_TwoChanStereoSnk_48_4_2_TwoChanStereoSrc_16_2_2_Balanced_Reliability",

            "name": "SingleDev_TwoChanStereoSnk_48_4_TwoChanStereoSrc_16_2_Balanced_Reliability",

            "codec_config_name": "SingleDev_TwoChanStereoSnk_48_4_TwoChanStereoSrc_16_2",

            "qos_config_name": ["QoS_Config_Balanced_Reliability"]

        },

        {

            "name": "SingleDev_TwoChanStereoSnk_48_4_1_OneChanMonoSrc_32_2_1_Balanced_Reliability",

            "name": "SingleDev_TwoChanStereoSnk_48_4_OneChanMonoSrc_32_2_Balanced_Reliability",

            "codec_config_name": "SingleDev_TwoChanStereoSnk_48_4_OneChanMonoSrc_32_2",

            "qos_config_name": ["QoS_Config_Balanced_Reliability"]

        },

        {

            "name": "SingleDev_TwoChanStereoSnk_48_4_2_OneChanMonoSrc_32_2_2_Balanced_Reliability",

            "codec_config_name": "SingleDev_TwoChanStereoSnk_48_4_OneChanMonoSrc_32_2",

            "qos_config_name": ["QoS_Config_Balanced_Reliability"]

        },

        {

            "name": "SingleDev_TwoChanStereoSnk_48_4_1_OneChanMonoSrc_24_2_1_Balanced_Reliability",

            "name": "SingleDev_TwoChanStereoSnk_48_4_1_OneChanMonoSrc_24_2_Balanced_Reliability",

            "codec_config_name": "SingleDev_TwoChanStereoSnk_48_4_OneChanMonoSrc_24_2",

            "qos_config_name": ["QoS_Config_Balanced_Reliability"]

        },

        {

            "name": "SingleDev_TwoChanStereoSnk_48_4_2_OneChanMonoSrc_24_2_2_Balanced_Reliability",

            "codec_config_name": "SingleDev_TwoChanStereoSnk_48_4_OneChanMonoSrc_24_2",

            "qos_config_name": ["QoS_Config_Balanced_Reliability"]

        },

        {

            "name": "SingleDev_TwoChanStereoSnk_48_4_1_OneChanMonoSrc_16_2_1_Balanced_Reliability",

            "codec_config_name": "SingleDev_TwoChanStereoSnk_48_4_OneChanMonoSrc_16_2",

            "qos_config_name": ["QoS_Config_Balanced_Reliability"]

        },

        {

            "name": "SingleDev_TwoChanStereoSnk_48_4_2_OneChanMonoSrc_16_2_2_Balanced_Reliability",

            "name": "SingleDev_TwoChanStereoSnk_48_4_1_OneChanMonoSrc_16_2_Balanced_Reliability",

            "codec_config_name": "SingleDev_TwoChanStereoSnk_48_4_OneChanMonoSrc_16_2",

            "qos_config_name": ["QoS_Config_Balanced_Reliability"]

        },

        {

            "name": "SingleDev_OneChanStereoSnk_48_4_1_OneChanMonoSrc_32_2_1_Balanced_Reliability",

            "codec_config_name": "SingleDev_OneChanStereoSnk_48_4_OneChanMonoSrc_32_2",

            "qos_config_name": ["QoS_Config_Balanced_Reliability"]

        },

        {

            "name": "SingleDev_OneChanStereoSnk_48_4_2_OneChanMonoSrc_32_2_2_Balanced_Reliability",

            "name": "SingleDev_OneChanStereoSnk_48_4_1_OneChanMonoSrc_32_2_Balanced_Reliability",

            "codec_config_name": "SingleDev_OneChanStereoSnk_48_4_OneChanMonoSrc_32_2",

            "qos_config_name": ["QoS_Config_Balanced_Reliability"]

        },

        {

            "name": "SingleDev_OneChanStereoSnk_48_4_1_OneChanMonoSrc_24_2_1_Balanced_Reliability",

            "codec_config_name": "SingleDev_OneChanStereoSnk_48_4_OneChanMonoSrc_24_2",

            "qos_config_name": ["QoS_Config_Balanced_Reliability"]

        },

        {

            "name": "SingleDev_OneChanStereoSnk_48_4_2_OneChanMonoSrc_24_2_2_Balanced_Reliability",

            "name": "SingleDev_OneChanStereoSnk_48_4_1_OneChanMonoSrc_24_2_Balanced_Reliability",

            "codec_config_name": "SingleDev_OneChanStereoSnk_48_4_OneChanMonoSrc_24_2",

            "qos_config_name": ["QoS_Config_Balanced_Reliability"]

        },

        {

            "name": "SingleDev_OneChanStereoSnk_48_4_1_OneChanMonoSrc_16_2_1_Balanced_Reliability",

            "name": "SingleDev_OneChanStereoSnk_48_4_1_OneChanMonoSrc_16_2_Balanced_Reliability",

            "codec_config_name": "SingleDev_OneChanStereoSnk_48_4_OneChanMonoSrc_16_2",

            "qos_config_name": ["QoS_Config_Balanced_Reliability"]

        },

        {

            "name": "SingleDev_OneChanStereoSnk_48_4_2_OneChanMonoSrc_16_2_2_Balanced_Reliability",

            "codec_config_name": "SingleDev_OneChanStereoSnk_48_4_OneChanMonoSrc_16_2",

            "qos_config_name": ["QoS_Config_Balanced_Reliability"]

        },

        {

            "name": "SingleDev_OneChanMonoSnk_48_4_1_OneChanMonoSrc_32_2_1_Balanced_Reliability",

            "codec_config_name": "SingleDev_OneChanMonoSnk_48_4_OneChanMonoSrc_32_2",

            "qos_config_name": ["QoS_Config_Balanced_Reliability"]

        },

        {

            "name": "SingleDev_OneChanMonoSnk_48_4_2_OneChanMonoSrc_32_2_2_Balanced_Reliability",

            "name": "SingleDev_OneChanMonoSnk_48_4_1_OneChanMonoSrc_32_2_Balanced_Reliability",

            "codec_config_name": "SingleDev_OneChanMonoSnk_48_4_OneChanMonoSrc_32_2",

            "qos_config_name": ["QoS_Config_Balanced_Reliability"]

        },
@@ -1128,17 +1033,7 @@ 
            "qos_config_name": ["QoS_Config_Balanced_Reliability"]

        },

        {

            "name": "SingleDev_OneChanMonoSnk_48_4_2_OneChanMonoSrc_24_2_2_Balanced_Reliability",

            "codec_config_name": "SingleDev_OneChanMonoSnk_48_4_OneChanMonoSrc_24_2",

            "qos_config_name": ["QoS_Config_Balanced_Reliability"]

        },

        {

            "name": "SingleDev_OneChanMonoSnk_48_4_1_OneChanMonoSrc_16_2_1_Balanced_Reliability",

            "codec_config_name": "SingleDev_OneChanMonoSnk_48_4_OneChanMonoSrc_16_2",

            "qos_config_name": ["QoS_Config_Balanced_Reliability"]

        },

        {

            "name": "SingleDev_OneChanMonoSnk_48_4_2_OneChanMonoSrc_16_2_2_Balanced_Reliability",

            "name": "SingleDev_OneChanMonoSnk_48_4_1_OneChanMonoSrc_16_2_Balanced_Reliability",

            "codec_config_name": "SingleDev_OneChanMonoSnk_48_4_OneChanMonoSrc_16_2",

            "qos_config_name": ["QoS_Config_Balanced_Reliability"]

        },

system/bta/le_audio/audio_set_scenarios.json

+40 −61

File changed.

Preview size limit exceeded, changes collapsed.

system/bta/le_audio/devices.cc

+2 −1
Original line number Diff line number Diff line
@@ -141,7 +141,8 @@ int LeAudioDeviceGroup::NumOfConnected(types::LeAudioContextType context_type) { 
      leAudioDevices_.begin(), leAudioDevices_.end(),

      [type_set, check_context_type](auto& iter) {

        if (iter.expired()) return false;

        if (iter.lock()->conn_id_ == GATT_INVALID_CONN_ID) return false;

        if (iter.lock()->GetConnectionState() != DeviceConnectState::CONNECTED)

          return false;



        if (!check_context_type) return true;

system/bta/le_audio/state_machine.cc

+0 −1
Original line number Diff line number Diff line
@@ -605,7 +605,6 @@ class LeAudioGroupStateMachineImpl : public LeAudioGroupStateMachine { 
  void ProcessHciNotifAclDisconnected(LeAudioDeviceGroup* group,

                                      LeAudioDevice* leAudioDevice) {

    FreeLinkQualityReports(leAudioDevice);

    leAudioDevice->conn_id_ = GATT_INVALID_CONN_ID;

    /* mark ASEs as not used. */

    leAudioDevice->DeactivateAllAses();

system/bta/le_audio/state_machine_test.cc

+77 −5
Original line number Diff line number Diff line
@@ -78,6 +78,8 @@ constexpr LeAudioContextType kContextTypeConversational = 
    static_cast<LeAudioContextType>(0x0002);

constexpr LeAudioContextType kContextTypeMedia =

    static_cast<LeAudioContextType>(0x0004);

constexpr LeAudioContextType kContextTypeLive =

    static_cast<LeAudioContextType>(0x0040);

constexpr LeAudioContextType kContextTypeSoundEffects =

    static_cast<LeAudioContextType>(0x0080);

constexpr LeAudioContextType kContextTypeRingtone =
@@ -548,6 +550,9 @@ class StateMachineTest : public Test { 


  void InjectAclDisconnected(LeAudioDeviceGroup* group,

                             LeAudioDevice* leAudioDevice) {

    // Do what the client.cc does when handling the disconnection event

    leAudioDevice->conn_id_ = GATT_INVALID_CONN_ID;

    leAudioDevice->SetConnectionState(DeviceConnectState::DISCONNECTED);

    LeAudioGroupStateMachine::Get()->ProcessHciNotifAclDisconnected(

        group, leAudioDevice);

  }
@@ -740,6 +745,11 @@ class StateMachineTest : public Test { 
        num_ase_src = 1 + additional_src_ases;

        break;



      case kContextTypeLive:

        num_ase_snk = 1 + additional_snk_ases;

        num_ase_src = 1 + additional_src_ases;

        break;



      default:

        ASSERT_TRUE(false);

    }
@@ -757,7 +767,7 @@ class StateMachineTest : public Test { 


        // Prepare Sink Published Audio Capability records

        if ((kContextTypeRingtone | kContextTypeMedia |

             kContextTypeConversational)

             kContextTypeConversational | kContextTypeLive)

                .test(context_type)) {

          // Set target ASE configurations

          std::vector<types::acs_ac_record> pac_recs;
@@ -775,14 +785,15 @@ class StateMachineTest : public Test { 
          leAudioDevice->snk_pacs_.emplace_back(

              std::make_tuple(std::move(handle_pair), pac_recs));



          snk_context_type.set(static_cast<LeAudioContextType>(context_type));

          snk_context_type.set(context_type);

          leAudioDevice->snk_audio_locations_ =

              ::le_audio::codec_spec_conf::kLeAudioLocationFrontLeft |

              ::le_audio::codec_spec_conf::kLeAudioLocationFrontRight;

        }



        // Prepare Source Published Audio Capability records

        if (context_type == kContextTypeConversational) {

        if ((context_type == kContextTypeConversational) ||

            (context_type == kContextTypeLive)) {

          // Set target ASE configurations

          std::vector<types::acs_ac_record> pac_recs;
@@ -799,8 +810,7 @@ class StateMachineTest : public Test { 


          leAudioDevice->src_pacs_.emplace_back(

              std::make_tuple(std::move(handle_pair), pac_recs));

          src_context_type.set(

              static_cast<LeAudioContextType>(kContextTypeConversational));

          src_context_type.set(context_type);



          leAudioDevice->src_audio_locations_ =

              ::le_audio::codec_spec_conf::kLeAudioLocationFrontLeft |
@@ -3302,6 +3312,8 @@ TEST_F(StateMachineTest, testAttachDeviceToTheStream) { 
            types::AseState::BTA_LE_AUDIO_ASE_STATE_STREAMING);



  lastDevice->conn_id_ = 3;

  lastDevice->SetConnectionState(DeviceConnectState::CONNECTED);



  group->UpdateAudioContextTypeAvailability();



  // Make sure ASE with disconnected CIS are not left in STREAMING
@@ -3344,6 +3356,64 @@ TEST_F(StateMachineTest, testAttachDeviceToTheStream) { 
  ASSERT_NE(ase->retrans_nb, 0);

}



TEST_F(StateMachineTest, testStreamToGettingReadyDevice) {

  const auto context_type = kContextTypeLive;

  const auto leaudio_group_id = 666;

  const auto num_devices = 2;



  ContentControlIdKeeper::GetInstance()->SetCcid(call_context, call_ccid);



  // Prepare multiple fake connected devices in a group

  auto* group =

      PrepareSingleTestDeviceGroup(leaudio_group_id, context_type, num_devices);



  // Simulate the 2nd device still getting ready

  auto* firstDevice = group->GetFirstDevice();

  auto* secondDevice = group->GetNextDevice(firstDevice);

  secondDevice->SetConnectionState(

      DeviceConnectState::CONNECTED_BY_USER_GETTING_READY);

  group->UpdateAudioContextTypeAvailability();



  ASSERT_EQ(group->Size(), num_devices);

  ASSERT_EQ(1, group->NumOfConnected());



  PrepareConfigureCodecHandler(group);

  PrepareConfigureQosHandler(group);

  PrepareEnableHandler(group);

  PrepareReceiverStartReady(group);

  PrepareDisableHandler(group);

  PrepareReleaseHandler(group);



  /* Three Writes:

   * 1: Codec Config

   * 2: Codec QoS

   * 3: Enabling

   */

  // Expect actions only on the already prepared device

  EXPECT_CALL(gatt_queue, WriteCharacteristic(firstDevice->conn_id_,

                                              firstDevice->ctp_hdls_.val_hdl, _,

                                              GATT_WRITE_NO_RSP, _, _))

      .Times(AtLeast(3));



  EXPECT_CALL(*mock_iso_manager_, CreateCig(_, _)).Times(1);

  EXPECT_CALL(*mock_iso_manager_, EstablishCis(_)).Times(1);

  EXPECT_CALL(*mock_iso_manager_, SetupIsoDataPath(_, _)).Times(2);



  InjectInitialIdleNotification(group);



  // Start the configuration and the stream

  LeAudioGroupStateMachine::Get()->StartStream(

      group, context_type,

      {.sink = types::AudioContexts(context_type),

       .source = types::AudioContexts(context_type)});



  // Check if group has transitioned to a proper state with one device still

  // being in the `CONNECTED_BY_USER_GETTING_READY` state

  ASSERT_EQ(group->GetState(),

            types::AseState::BTA_LE_AUDIO_ASE_STATE_STREAMING);

  testing::Mock::VerifyAndClearExpectations(&mock_iso_manager_);

}



TEST_F(StateMachineTest, testAttachDeviceToTheConversationalStream) {

  const auto context_type = kContextTypeConversational;

  const auto leaudio_group_id = 6;
@@ -3411,6 +3481,8 @@ TEST_F(StateMachineTest, testAttachDeviceToTheConversationalStream) { 
            types::AseState::BTA_LE_AUDIO_ASE_STATE_STREAMING);



  lastDevice->conn_id_ = 3;

  lastDevice->SetConnectionState(DeviceConnectState::CONNECTED);



  group->UpdateAudioContextTypeAvailability();



  // Make sure ASE with disconnected CIS are not left in STREAMING