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

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

Merge changes from topic "floss_suspend_resume_api" 

* changes:
  Floss: Allow Wake By HID for LE.
  Floss: AllowWakeByHid for bonded LE HID devices.
parents d816836a 22158995

system/bta/dm/bta_dm_act.cc

+4 −4
Original line number Diff line number Diff line
@@ -4168,12 +4168,12 @@ void bta_dm_set_event_filter_connection_setup_all_devices() { 
 *

 * Description     Allow the device to be woken by HID devices

 *

 * Parameters

 * Parameters      std::vector or RawAddress

 *

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

void bta_dm_allow_wake_by_hid() {

void bta_dm_allow_wake_by_hid(std::vector<RawAddress> le_hid_devices) {

  // Autoplumbed

  bluetooth::shim::BTM_AllowWakeByHid();

  bluetooth::shim::BTM_AllowWakeByHid(le_hid_devices);

}



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

system/bta/dm/bta_dm_api.cc

+3 −2
Original line number Diff line number Diff line
@@ -697,9 +697,10 @@ void BTA_DmSetEventFilterConnectionSetupAllDevices() { 
      base::Bind(bta_dm_set_event_filter_connection_setup_all_devices));

}



void BTA_DmAllowWakeByHid() {

void BTA_DmAllowWakeByHid(std::vector<RawAddress> le_hid_devices) {

  APPL_TRACE_API("BTA_DmAllowWakeByHid");

  do_in_main_thread(FROM_HERE, base::Bind(bta_dm_allow_wake_by_hid));

  do_in_main_thread(FROM_HERE,

                    base::Bind(bta_dm_allow_wake_by_hid, le_hid_devices));

}



void BTA_DmRestoreFilterAcceptList() {

system/bta/dm/bta_dm_int.h

+1 −1
Original line number Diff line number Diff line
@@ -547,7 +547,7 @@ extern void bta_dm_clear_filter_accept_list(void); 
extern void bta_dm_disconnect_all_acls(void);

extern void bta_dm_le_rand(LeRandCallback cb);

extern void bta_dm_set_event_filter_connection_setup_all_devices();

extern void bta_dm_allow_wake_by_hid();

extern void bta_dm_allow_wake_by_hid(std::vector<RawAddress> le_hid_devices);

extern void bta_dm_restore_filter_accept_list();

extern void bta_dm_set_default_event_mask();

extern void bta_dm_set_event_filter_inquiry_result_all_devices();

system/bta/include/bta_api.h

+1 −1
Original line number Diff line number Diff line
@@ -1254,7 +1254,7 @@ extern void BTA_DmSetEventFilterConnectionSetupAllDevices(); 
 * Parameters

 *

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

extern void BTA_DmAllowWakeByHid();

extern void BTA_DmAllowWakeByHid(std::vector<RawAddress> le_hid_devices);



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

 *

system/btif/include/btif_storage.h

+11 −0
Original line number Diff line number Diff line
@@ -241,6 +241,17 @@ bt_status_t btif_storage_load_bonded_hid_info(void); 
 ******************************************************************************/

bt_status_t btif_storage_remove_hid_info(const RawAddress& remote_bd_addr);



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

 *

 * Function         btif_storage_get_hid_device_addresses

 *

 * Description      BTIF storage API - Finds all bonded HID devices

 *

 * Returns          std::vector of RawAddress

 *

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

std::vector<RawAddress> btif_storage_get_hid_device_addresses(void);



/** Loads information about bonded hearing aid devices */

void btif_storage_load_bonded_hearing_aids();