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

Commit 72f64b94 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge changes Iac4351a2,Ib8fadd80 

* changes:
  Demote log message to informational LeAddressManagerCallback
  shim: Add sync at completion connection test
parents 92a1d490 6a91277a

system/gd/hci/acl_manager/le_impl.h

+1 −2
Original line number Diff line number Diff line
@@ -295,8 +295,7 @@ struct le_impl : public bluetooth::hci::LeAddressManagerCallback { 
      hci::ErrorCode hci_status, uint16_t handle, uint8_t version, uint16_t manufacturer_name, uint16_t sub_version) {

    auto callbacks = get_callbacks(handle);

    if (callbacks == nullptr) {

      LOG_WARN("Can't find connection 0x%hx", handle);

      ASSERT(!crash_on_unknown_handle_);

      LOG_INFO("No le connection registered for 0x%hx", handle);

      return;

    }

    callbacks->OnReadRemoteVersionInformationComplete(hci_status, version, manufacturer_name, sub_version);

system/main/test/main_shim_test.cc

+8 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
#include <gmock/gmock.h>

#include <gtest/gtest.h>

#include <condition_variable>

#include <future>

#include <map>

#include <thread>
@@ -362,4 +363,11 @@ TEST_F(MainShimTest, connect_and_disconnect) { 


  result = rx_disconnect_future.get();

  ASSERT_EQ(123, result);



  // *Our* task completing indicates reactor is done

  std::promise<void> done;

  auto future = done.get_future();

  handler_->Call([](std::promise<void> done) { done.set_value(); },

                 std::move(done));

  future.wait();

}