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

Commit c92a9497 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "LE Advertising: RESOLVABLE_ types are not supported" am: e99dab22 

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

Change-Id: Icfc4c4ab169444a0063c6db9528dbb87f4254bbe
parents 07238d02 e99dab22

system/gd/hci/le_advertising_manager.cc

+34 −28
Original line number Diff line number Diff line
@@ -329,7 +329,8 @@ struct LeAdvertisingManager::impl : public bluetooth::hci::LeAddressManagerCallb 
    set_parameters(id, config);



    auto address_policy = le_address_manager_->GetAddressPolicy();

    if (config.own_address_type == OwnAddressType::RANDOM_DEVICE_ADDRESS) {

    switch (config.own_address_type) {

      case OwnAddressType::RANDOM_DEVICE_ADDRESS:

        if (address_policy == LeAddressManager::AddressPolicy::USE_NON_RESOLVABLE_ADDRESS ||

            address_policy == LeAddressManager::AddressPolicy::USE_RESOLVABLE_ADDRESS) {

          AddressWithType address_with_type = le_address_manager_->GetAnotherAddress();
@@ -354,9 +355,14 @@ struct LeAdvertisingManager::impl : public bluetooth::hci::LeAddressManagerCallb 
                  id, advertising_sets_[id].current_address.GetAddress()),

              module_handler_->BindOnce(impl::check_status<LeSetExtendedAdvertisingRandomAddressCompleteView>));

        }

    } else {

        break;

      case OwnAddressType::PUBLIC_DEVICE_ADDRESS:

        advertising_sets_[id].current_address =

            AddressWithType(controller_->GetMacAddress(), AddressType::PUBLIC_DEVICE_ADDRESS);

        break;

      default:

        // For resolvable address types, set the Peer address and type, and the controller generates the address.

        LOG_ALWAYS_FATAL("Unsupported Advertising Type %s", OwnAddressTypeText(config.own_address_type).c_str());

    }

    if (config.advertising_type == AdvertisingType::ADV_IND ||

        config.advertising_type == AdvertisingType::ADV_NONCONN_IND) {