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

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

Merge "Trigger callback when start advertising fail" am: ea210717 am: 0f5df942 am: a3df1d12 

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



Change-Id: I544dbc376ccb98fbdc9beb3dad37ee8bd7dacedc
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 919be793 a3df1d12

system/gd/hci/le_advertising_manager.cc

+30 −0
Original line number Diff line number Diff line
@@ -223,6 +223,7 @@ struct LeAdvertisingManager::impl : public bluetooth::hci::LeAddressManagerCallb 
        id++;

      }

      if (id == num_instances_) {

        LOG_WARN("Number of max instances %d reached", (uint16_t)num_instances_);

        return kInvalidId;

      }

      advertising_sets_[id].in_use = true;
@@ -1264,6 +1265,11 @@ struct LeAdvertisingManager::impl : public bluetooth::hci::LeAddressManagerCallb 
          ErrorCodeText(status_view.GetStatus()).c_str());

    }

  }



  void start_advertising_fail(int reg_id, AdvertisingCallback::AdvertisingStatus status) {

    ASSERT(status != AdvertisingCallback::AdvertisingStatus::SUCCESS);

    advertising_callbacks_->OnAdvertisingSetStarted(reg_id, kInvalidId, 0, status);

  }

};



LeAdvertisingManager::LeAdvertisingManager() {
@@ -1303,16 +1309,26 @@ AdvertiserId LeAdvertisingManager::create_advertiser( 
    if (config.own_address_type == hci::OwnAddressType::RESOLVABLE_OR_PUBLIC_ADDRESS ||

        config.own_address_type == hci::OwnAddressType::RESOLVABLE_OR_RANDOM_ADDRESS) {

      LOG_WARN("Peer address can not be empty");

      CallOn(

          pimpl_.get(), &impl::start_advertising_fail, reg_id, AdvertisingCallback::AdvertisingStatus::INTERNAL_ERROR);

      return kInvalidId;

    }

    if (config.advertising_type == hci::AdvertisingType::ADV_DIRECT_IND ||

        config.advertising_type == hci::AdvertisingType::ADV_DIRECT_IND_LOW) {

      LOG_WARN("Peer address can not be empty for directed advertising");

      CallOn(

          pimpl_.get(), &impl::start_advertising_fail, reg_id, AdvertisingCallback::AdvertisingStatus::INTERNAL_ERROR);

      return kInvalidId;

    }

  }

  AdvertiserId id = pimpl_->allocate_advertiser();

  if (id == kInvalidId) {

    LOG_WARN("Number of max instances reached");

    CallOn(

        pimpl_.get(),

        &impl::start_advertising_fail,

        reg_id,

        AdvertisingCallback::AdvertisingStatus::TOO_MANY_ADVERTISERS);

    return id;

  }

  GetHandler()->Post(common::BindOnce(
@@ -1343,29 +1359,43 @@ AdvertiserId LeAdvertisingManager::ExtendedCreateAdvertiser( 
  if (config.directed) {

    if (config.peer_address == Address::kEmpty) {

      LOG_INFO("Peer address can not be empty for directed advertising");

      CallOn(

          pimpl_.get(), &impl::start_advertising_fail, reg_id, AdvertisingCallback::AdvertisingStatus::INTERNAL_ERROR);

      return kInvalidId;

    }

  }

  if (config.channel_map == 0) {

    LOG_INFO("At least one channel must be set in the map");

    CallOn(pimpl_.get(), &impl::start_advertising_fail, reg_id, AdvertisingCallback::AdvertisingStatus::INTERNAL_ERROR);

    return kInvalidId;

  }

  if (!config.legacy_pdus) {

    if (config.connectable && config.scannable) {

      LOG_INFO("Extended advertising PDUs can not be connectable and scannable");

      CallOn(

          pimpl_.get(), &impl::start_advertising_fail, reg_id, AdvertisingCallback::AdvertisingStatus::INTERNAL_ERROR);

      return kInvalidId;

    }

    if (config.high_duty_directed_connectable) {

      LOG_INFO("Extended advertising PDUs can not be high duty cycle");

      CallOn(

          pimpl_.get(), &impl::start_advertising_fail, reg_id, AdvertisingCallback::AdvertisingStatus::INTERNAL_ERROR);

      return kInvalidId;

    }

  }

  if (config.interval_min > config.interval_max) {

    LOG_INFO("Advertising interval: min (%hu) > max (%hu)", config.interval_min, config.interval_max);

    CallOn(pimpl_.get(), &impl::start_advertising_fail, reg_id, AdvertisingCallback::AdvertisingStatus::INTERNAL_ERROR);

    return kInvalidId;

  }

  AdvertiserId id = pimpl_->allocate_advertiser();

  if (id == kInvalidId) {

    LOG_WARN("Number of max instances reached");

    CallOn(

        pimpl_.get(),

        &impl::start_advertising_fail,

        reg_id,

        AdvertisingCallback::AdvertisingStatus::TOO_MANY_ADVERTISERS);

    return id;

  }

  CallOn(