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

Commit 9f4a99f6 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge changes from topic "cherrypicker-L85400000956846144:N45900001302765211"... 

Merge changes from topic "cherrypicker-L85400000956846144:N45900001302765211" into tm-qpr-dev am: 55733faa

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



Change-Id: I72d41e863d7b44a94bf21e01eb91e81d70a38261
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 15f5dd4a 55733faa

system/gd/hci/le_advertising_manager.cc

+13 −4
Original line number Diff line number Diff line
@@ -164,18 +164,27 @@ struct LeAdvertisingManager::impl : public bluetooth::hci::LeAddressManagerCallb 
  void multi_advertising_state_change(hci::VendorSpecificEventView event) {

    auto view = hci::LEAdvertiseStateChangeEventView::Create(event);

    ASSERT(view.IsValid());



    auto advertiser_id = view.GetAdvertisingInstance();



    LOG_INFO(

        "Instance: 0x%x StateChangeReason: 0x%s Handle: 0x%x Address: %s",

        view.GetAdvertisingInstance(),

        advertiser_id,

        VseStateChangeReasonText(view.GetStateChangeReason()).c_str(),

        view.GetConnectionHandle(),

        advertising_sets_[view.GetAdvertisingInstance()].current_address.ToString().c_str());



    if (view.GetStateChangeReason() == VseStateChangeReason::CONNECTION_RECEIVED) {

      acl_manager_->OnAdvertisingSetTerminated(

          ErrorCode::SUCCESS,

          view.GetConnectionHandle(),

          advertising_sets_[view.GetAdvertisingInstance()].current_address);

          ErrorCode::SUCCESS, view.GetConnectionHandle(), advertising_sets_[advertiser_id].current_address);



      enabled_sets_[advertiser_id].advertising_handle_ = kInvalidHandle;



      if (!advertising_sets_[advertiser_id].directed) {

        // TODO(250666237) calculate remaining duration and advertising events

        LOG_INFO("Resuming advertising, since not directed");

        enable_advertiser(advertiser_id, true, 0, 0);

      }

    }

  }