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

Commit 47bf53a7 authored by Henri Chataing's avatar Henri Chataing Committed by Automerger Merge Worker
Browse files

Merge changes Ia6812ab2,I17e25f54 into main am: 9058b0b8 

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



Change-Id: I815c95d55cc0d1d2efc7c9afcf34cdc3101a92ac
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents d14fe331 9058b0b8

system/audio_hal_interface/aidl/a2dp_provider_info.cc

+2 −2
Original line number Diff line number Diff line
@@ -261,7 +261,7 @@ std::optional<btav_a2dp_codec_index_t> ProviderInfo::SourceCodecIndex( 


std::optional<btav_a2dp_codec_index_t> ProviderInfo::SourceCodecIndex(

    uint8_t const* codec_info) const {

  LOG_ASSERT(codec_info != nullptr) << "codec_info is unexpectedly null";

  log::assert_that(codec_info != nullptr, "codec_info is unexpectedly null");

  auto codec_type = A2DP_GetCodecType(codec_info);

  switch (codec_type) {

    case A2DP_MEDIA_CT_SBC: {
@@ -308,7 +308,7 @@ std::optional<btav_a2dp_codec_index_t> ProviderInfo::SinkCodecIndex( 


std::optional<btav_a2dp_codec_index_t> ProviderInfo::SinkCodecIndex(

    uint8_t const* codec_info) const {

  LOG_ASSERT(codec_info != nullptr) << "codec_info is unexpectedly null";

  log::assert_that(codec_info != nullptr, "codec_info is unexpectedly null");

  auto codec_type = A2DP_GetCodecType(codec_info);

  switch (codec_type) {

    case A2DP_MEDIA_CT_SBC: {

system/bta/csis/csis_client.cc

+14 −7
Original line number Diff line number Diff line
@@ -328,7 +328,8 @@ class CsisClientImpl : public CsisClient { 
    while (prev_dev) {

      if (prev_dev->IsConnected()) {

        auto prev_csis_instance = prev_dev->GetCsisInstanceByGroupId(group_id);

        LOG_ASSERT(prev_csis_instance) << " prev_csis_instance does not exist!";

        log::assert_that(prev_csis_instance != nullptr,

                         "prev_csis_instance does not exist!");

        SetLock(prev_dev, prev_csis_instance,

                CsisLockState::CSIS_STATE_UNLOCKED);

      }
@@ -384,7 +385,7 @@ class CsisClientImpl : public CsisClient { 


    /* All is good, continue. Try to send lock to other devices.*/

    auto csis_instance = device->GetCsisInstanceByGroupId(group_id);

    LOG_ASSERT(csis_instance) << " csis_instance does not exist!";

    log::assert_that(csis_instance != nullptr, "csis_instance does not exist!");

    csis_instance->SetLockState(target_lock_state);



    if (csis_group->GetLockTransitionCnt() == 0) {
@@ -411,7 +412,8 @@ class CsisClientImpl : public CsisClient { 


      if (next_dev) {

        auto next_csis_inst = next_dev->GetCsisInstanceByGroupId(group_id);

        LOG_ASSERT(csis_instance) << " csis_instance does not exist!";

        log::assert_that(csis_instance != nullptr,

                         "csis_instance does not exist!");

#if CSIP_UPPER_TESTER_FORCE_TO_SEND_LOCK == FALSE

        if (next_csis_inst->GetLockState() ==

            CsisLockState::CSIS_STATE_LOCKED) {
@@ -539,7 +541,8 @@ class CsisClientImpl : public CsisClient { 
      }



      auto csis_instance = csis_device->GetCsisInstanceByGroupId(group_id);

      LOG_ASSERT(csis_instance) << " csis_instance does not exist!";

      log::assert_that(csis_instance != nullptr,

                       "csis_instance does not exist!");

      SetLock(csis_device, csis_instance, new_lock_state);

    } else {

      /* For unlocking, we don't have to monitor status of unlocking device,
@@ -548,7 +551,8 @@ class CsisClientImpl : public CsisClient { 
       */

      auto csis_device = csis_group->GetLastDevice();

      auto csis_instance = csis_device->GetCsisInstanceByGroupId(group_id);

      LOG_ASSERT(csis_instance) << " csis_instance does not exist!";

      log::assert_that(csis_instance != nullptr,

                       "csis_instance does not exist!");

      while (csis_device) {

        if ((csis_device->IsConnected()) &&

            ((csis_instance->GetLockState() != new_lock_state))) {
@@ -1645,7 +1649,8 @@ class CsisClientImpl : public CsisClient { 
    if (group_id != bluetooth::groups::kGroupUnknown) {

      /* Group already exist. */

      csis_group = FindCsisGroup(group_id);

      LOG_ASSERT(csis_group) << " group does not exist? " << group_id;

      log::assert_that(csis_group != nullptr, "group does not exist? {}",

                       group_id);

    } else {

      /* Now having SIRK we can decide if the device belongs to some group we

       * know or this is a new group
@@ -1661,7 +1666,9 @@ class CsisClientImpl : public CsisClient { 
        /* Here it means, we have new group. Let's us create it */

        group_id =

            dev_groups_->AddDevice(device->addr, csis_instance->GetUuid());

        LOG_ASSERT(group_id != bluetooth::groups::kGroupUnknown);

        log::assert_that(

            group_id != bluetooth::groups::kGroupUnknown,

            "assert failed: group_id != bluetooth::groups::kGroupUnknown");

      } else {

        dev_groups_->AddDevice(device->addr, csis_instance->GetUuid(),

                               group_id);

system/bta/groups/groups.cc

+1 −1
Original line number Diff line number Diff line
@@ -118,7 +118,7 @@ class DeviceGroupsImpl : public DeviceGroups { 
      }

    }



    LOG_ASSERT(group);

    log::assert_that(group, "assert failed: group");



    if (group->Contains(addr)) {

      log::error("device {} already in the group: {}",

system/bta/has/has_client.cc

+7 −7
Original line number Diff line number Diff line
@@ -307,7 +307,7 @@ class HasClientImpl : public HasClient { 
    }



    /* Journal update */

    LOG_ASSERT(user_data != nullptr) << "Has operation context is missing!";

    log::assert_that(user_data != nullptr, "Has operation context is missing!");

    auto context = HasGattOpContext(user_data);

    UpdateJournalOpEntryStatus(*device, context, status);
@@ -341,7 +341,7 @@ class HasClientImpl : public HasClient { 
      return;

    }



    LOG_ASSERT(user_data != nullptr) << "Has operation context is missing!";

    log::assert_that(user_data != nullptr, "Has operation context is missing!");

    HasGattOpContext context(user_data);



    /* Journal update */
@@ -376,7 +376,7 @@ class HasClientImpl : public HasClient { 
      return;

    }



    LOG_ASSERT(user_data != nullptr) << "Has operation context is missing!";

    log::assert_that(user_data != nullptr, "Has operation context is missing!");

    HasGattOpContext context(user_data);



    /* Journal update */
@@ -415,7 +415,7 @@ class HasClientImpl : public HasClient { 
      return;

    }



    LOG_ASSERT(user_data != nullptr) << "Has operation context is missing!";

    log::assert_that(user_data != nullptr, "Has operation context is missing!");

    HasGattOpContext context(user_data);



    /* Journal update */
@@ -638,9 +638,9 @@ class HasClientImpl : public HasClient { 
    if (status != ErrorCode::NO_ERROR) {

      switch (operation.opcode) {

        case PresetCtpOpcode::READ_PRESETS:

          LOG_ASSERT(

              std::holds_alternative<RawAddress>(operation.addr_or_group))

              << " Unsupported group operation!";

          log::assert_that(

              std::holds_alternative<RawAddress>(operation.addr_or_group),

              "Unsupported group operation!");



          callbacks_->OnPresetInfoError(

              std::get<RawAddress>(operation.addr_or_group), operation.index,

system/bta/has/has_client_test.cc

+2 −2
Original line number Diff line number Diff line
@@ -956,7 +956,7 @@ class HasClientTestBase : public ::testing::Test { 
      std::vector<uint8_t> value, bool indicate, int index, int num_of_indices,

      GATT_WRITE_OP_CB cb, void* cb_data) {

    auto presets = current_peer_presets_.at(conn_id);

    LOG_ASSERT(!presets.empty()) << __func__ << " Mocking error!";

    log::assert_that(!presets.empty(), "Mocking error!");



    /* Index is a start index, not necessary is a valid index for the

     * peer device */
@@ -998,7 +998,7 @@ class HasClientTestBase : public ::testing::Test { 
                                      uint8_t index, GATT_WRITE_OP_CB cb,

                                      void* cb_data) {

    auto presets = current_peer_presets_.at(conn_id);

    LOG_ASSERT(!presets.empty()) << __func__ << " Mocking error!";

    log::assert_that(!presets.empty(), "Mocking error!");



    auto preset = presets.find(index);

    if (preset == presets.end()) {