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

Commit b4239605 authored by Mariusz Skamra's avatar Mariusz Skamra
Browse files

bta: le_audio: Fix the default struct ase cis_conn_handle 

The 0 is valid connection handle, thus the default CIS Connection
handle shall be set to value out of range 0x0000 to 0x0EFF.
This introduces kInvalidCisConnHandle and used this value by
default, as uninitialized value.

Bug: 357472821
Flag: Exempt; trivial change covered with unit tests
Test: atest bluetooth_le_audio_test
Test: atest bluetooth_le_audio_client_test
Change-Id: Ie89d74bd5757c49e5ec53395ff952c4d825963fd
parent 8628810a

system/bta/le_audio/device_groups.cc

+1 −1
Original line number Diff line number Diff line
@@ -62,7 +62,7 @@ void LeAudioDeviceGroup::RemoveNode(const std::shared_ptr<LeAudioDevice>& leAudi 
  leAudioDevice->group_id_ = bluetooth::groups::kGroupUnknown;

  for (auto ase : leAudioDevice->ases_) {

    ase.active = false;

    ase.cis_conn_hdl = 0;

    ase.cis_conn_hdl = kInvalidCisConnHandle;

  }



  leAudioDevices_.erase(

system/bta/le_audio/devices.cc

+1 −1
Original line number Diff line number Diff line
@@ -1149,7 +1149,7 @@ void LeAudioDevice::DeactivateAllAses(void) { 
    ase.active = false;

    ase.reconfigure = 0;

    ase.cis_id = bluetooth::le_audio::kInvalidCisId;

    ase.cis_conn_hdl = 0;

    ase.cis_conn_hdl = bluetooth::le_audio::kInvalidCisConnHandle;

  }

}

system/bta/le_audio/devices_test.cc

+1 −1
Original line number Diff line number Diff line
@@ -1129,7 +1129,7 @@ protected: 
    for (const auto& ase : device->ases_) {

      ASSERT_FALSE(ase.active);

      ASSERT_TRUE(ase.cis_id == ::bluetooth::le_audio::kInvalidCisId);

      ASSERT_TRUE(ase.cis_conn_hdl == 0);

      ASSERT_TRUE(ase.cis_conn_hdl == ::bluetooth::le_audio::kInvalidCisConnHandle);

    }

  }

system/bta/le_audio/le_audio_client_test.cc

+1 −1
Original line number Diff line number Diff line
@@ -1397,7 +1397,7 @@ protected: 
          ase.active = false;

          ase.state = types::AseState::BTA_LE_AUDIO_ASE_STATE_IDLE;

          ase.cis_id = 0;

          ase.cis_conn_hdl = 0;

          ase.cis_conn_hdl = bluetooth::le_audio::kInvalidCisConnHandle;

        }

      }
































system/bta/le_audio/le_audio_types.h



+2
−1






























Original line number
Diff line number
Diff line







@@ -210,6 +210,7 @@ constexpr uint16_t kLeAudioCodecFrameLen120 = 120;







}  // namespace codec_spec_conf



















constexpr uint8_t kInvalidCisId = 0xFF;









constexpr uint16_t kInvalidCisConnHandle = 0xFFFF;



















namespace codec_spec_caps {









uint16_t constexpr SamplingFreqConfig2Capability(uint8_t conf) {








@@ -1120,7 +1121,7 @@ struct ase {







  uint8_t cis_id;









  const uint8_t direction;









  uint8_t target_latency;









  uint16_t cis_conn_hdl = 0;









  uint16_t cis_conn_hdl = kInvalidCisConnHandle;



















  bool active;









  bool reconfigure;