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

Commit d3257c8c authored by Chienyuan's avatar Chienyuan
Browse files

gd: Fix PDL of LeMultiAdvtParam 

Tag: #gd-refactor
Bug: 195288381
Test: gd/cert/run
Test: bluetooth_test_gd
BYPASS_LONG_LINES_REASON: Bluetooth likes 120 lines

Change-Id: I5f5fc6c2ec94cc8d8cdce5f11cd367229d39d06e
parent 844a7c34

system/gd/hci/hci_packets.pdl

+1 −0
Original line number Diff line number Diff line
@@ -4455,6 +4455,7 @@ packet LeMultiAdvtParam : LeMultiAdvt (sub_cmd = SET_PARAM) { 
  interval_max : 16,

  advt_type : AdvertisingType,

  own_address_type : OwnAddressType,

  own_address : Address,

  peer_address_type : PeerAddressType,

  peer_address : Address,

  channel_map : 8,

system/gd/hci/le_advertising_manager.cc

+7 −6
Original line number Diff line number Diff line
@@ -259,12 +259,6 @@ struct LeAdvertisingManager::impl : public bluetooth::hci::LeAddressManagerCallb 
        }

      } break;

      case (AdvertisingApiType::ANDROID_HCI): {

        set_parameters(id, config);

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

            config.advertising_type == AdvertisingType::ADV_NONCONN_IND) {

          set_data(id, true, config.scan_response);

        }

        set_data(id, false, config.advertisement);

        auto address_policy = le_address_manager_->GetAddressPolicy();

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

            address_policy == LeAddressManager::AddressPolicy::USE_RESOLVABLE_ADDRESS) {
@@ -272,6 +266,12 @@ struct LeAdvertisingManager::impl : public bluetooth::hci::LeAddressManagerCallb 
        } else {

          advertising_sets_[id].current_address = le_address_manager_->GetCurrentAddress();

        }

        set_parameters(id, config);

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

            config.advertising_type == AdvertisingType::ADV_NONCONN_IND) {

          set_data(id, true, config.scan_response);

        }

        set_data(id, false, config.advertisement);

        le_advertising_interface_->EnqueueCommand(

            hci::LeMultiAdvtSetRandomAddrBuilder::Create(advertising_sets_[id].current_address.GetAddress(), id),

            module_handler_->BindOnce(impl::check_status<LeMultiAdvtCompleteView>));
@@ -483,6 +483,7 @@ struct LeAdvertisingManager::impl : public bluetooth::hci::LeAddressManagerCallb 
                config.interval_max,

                config.advertising_type,

                config.own_address_type,

                advertising_sets_[advertiser_id].current_address.GetAddress(),

                config.peer_address_type,

                config.peer_address,

                config.channel_map,