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

Commit 4e8d9cf2 authored by Myles Watson's avatar Myles Watson Committed by Gerrit Code Review
Browse files

Merge changes Idfaf7b1f,I59f39723 into main 

* changes:
  bta_ag_test.cc: Remove unused includes
  Use GD for LeRand
parents a580cc14 8a4ca24e

system/bta/dm/bta_dm_act.cc

+2 −2
Original line number Diff line number Diff line
@@ -1637,9 +1637,9 @@ void bta_dm_disconnect_all_acls(void) { 
 * Parameters:      |cb| Callback to receive the random number.

 *

 ******************************************************************************/

void bta_dm_le_rand(LeRandCallback cb) {

void bta_dm_le_rand(bluetooth::hci::LeRandCallback cb) {

  log::verbose("bta_dm_le_rand in bta_dm_act");

  bluetooth::shim::BTM_LeRand(std::move(cb));

  bluetooth::shim::GetController()->LeRand(std::move(cb));

}



/*******************************************************************************

system/bta/dm/bta_dm_api.cc

+2 −1
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ 
#include "bta/dm/bta_dm_disc.h"

#include "bta/dm/bta_dm_int.h"

#include "bta/dm/bta_dm_sec_int.h"

#include "hci/le_rand_callback.h"

#include "stack/include/bt_uuid16.h"

#include "stack/include/btm_api.h"

#include "stack/include/btm_client_interface.h"
@@ -449,7 +450,7 @@ void BTA_DmClearFilterAcceptList(void) { 
 * Returns          cb: callback to receive the resulting random number

 *

 ******************************************************************************/

void BTA_DmLeRand(LeRandCallback cb) {

void BTA_DmLeRand(bluetooth::hci::LeRandCallback cb) {

  log::verbose("BTA_DmLeRand");

  do_in_main_thread(FROM_HERE, base::BindOnce(bta_dm_le_rand, std::move(cb)));

}

system/bta/dm/bta_dm_int.h

+2 −1
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ 
#include "bta/include/bta_api.h"

#include "bta/include/bta_sec_api.h"

#include "bta/sys/bta_sys.h"

#include "hci/le_rand_callback.h"

#include "internal_include/bt_target.h"

#include "internal_include/bt_trace.h"

#include "macros.h"
@@ -336,7 +337,7 @@ void bta_dm_clear_event_filter(void); 
void bta_dm_clear_event_mask(void);

void bta_dm_clear_filter_accept_list(void);

void bta_dm_disconnect_all_acls(void);

void bta_dm_le_rand(LeRandCallback cb);

void bta_dm_le_rand(bluetooth::hci::LeRandCallback cb);

void bta_dm_set_event_filter_connection_setup_all_devices();

void bta_dm_allow_wake_by_hid(

    std::vector<RawAddress> classic_hid_devices,

system/bta/include/bta_api.h

+2 −2
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ 
#include <vector>



#include "bta_api_data_types.h"

#include "hci/le_rand_callback.h"

#include "internal_include/bt_target.h"

#include "macros.h"

#include "os/log.h"
@@ -854,7 +855,6 @@ void BTA_DmDisconnectAllAcls(void); 
 ******************************************************************************/

void BTA_DmClearFilterAcceptList(void);



using LeRandCallback = base::OnceCallback<void(uint64_t)>;

/*******************************************************************************

 *

 * Function         BTA_DmLeRand
@@ -864,7 +864,7 @@ using LeRandCallback = base::OnceCallback<void(uint64_t)>; 
 * Returns          cb: callback to receive the resulting random number

 *

 ******************************************************************************/

void BTA_DmLeRand(LeRandCallback cb);

void BTA_DmLeRand(bluetooth::hci::LeRandCallback cb);



/*******************************************************************************

 *

system/bta/test/bta_ag_test.cc

+0 −13
Original line number Diff line number Diff line
@@ -24,25 +24,12 @@ 
#include <gmock/gmock.h>

#include <gtest/gtest.h>



#include <chrono>

#include <iostream>

#include <memory>

#include <string>



#include "bta/ag/bta_ag_int.h"

#include "bta/include/bta_ag_swb_aptx.h"

#include "bta/include/bta_api.h"

#include "bta/include/bta_dm_api.h"

#include "bta/include/bta_hf_client_api.h"

#include "bta/include/bta_le_audio_api.h"

#include "common/message_loop_thread.h"

#include "hci/controller_interface_mock.h"

#include "os/system_properties.h"

#include "osi/include/compat.h"

#include "stack/btm/btm_int_types.h"

#include "stack/include/bt_device_type.h"

#include "stack/include/bt_name.h"

#include "stack/include/btm_status.h"

#include "test/common/main_handler.h"

#include "test/common/mock_functions.h"

#include "test/fake/fake_osi.h"