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

Commit 4f7ee226 authored by Martin Brabham's avatar Martin Brabham
Browse files

Floss: Restore the state of the for the filter accept list BTIF API 

Bug: 224603602
Test: mma -j $(nproc)
Test: ./build.py
Tag: #floss
Change-Id: Iaed69a8c9360409b4bda8dc78999206ae18d5dd4
parent 4060a309

system/btif/include/btif_dm.h

+1 −0
Original line number Diff line number Diff line
@@ -76,6 +76,7 @@ void btif_dm_clear_filter_accept_list(); 
void btif_dm_disconnect_all_acls();



void btif_dm_le_rand(LeRandCallback callback);

void btif_dm_restore_filter_accept_list();

void btif_dm_set_default_event_mask();

void btif_dm_set_event_filter_inquiry_result_all_devices();

system/btif/src/bluetooth.cc

+10 −1
Original line number Diff line number Diff line
@@ -478,6 +478,13 @@ static int set_default_event_mask() { 
  return BT_STATUS_SUCCESS;

}



static int restore_filter_accept_list() {

  if (!interface_ready()) return BT_STATUS_NOT_READY;

  do_in_main_thread(FROM_HERE,

                    base::BindOnce(btif_dm_restore_filter_accept_list));

  return BT_STATUS_SUCCESS;

}



static void dump(int fd, const char** arguments) {

  btif_debug_conn_dump(fd);

  btif_debug_bond_event_dump(fd);
@@ -737,7 +744,9 @@ EXPORT_SYMBOL bt_interface_t bluetoothInterface = { 
    clear_filter_accept_list,

    disconnect_all_acls,

    le_rand,

    set_default_event_mask set_event_filter_inquiry_result_all_devices};

    restore_filter_accept_list,

    set_default_event_mask,

    set_event_filter_inquiry_result_all_devices};



// callback reporting helpers

system/btif/src/btif_dm.cc

+5 −0
Original line number Diff line number Diff line
@@ -3294,6 +3294,11 @@ void btif_dm_le_rand(LeRandCallback callback) { 
  bta_dm_le_rand(callback);

}



void btif_dm_restore_filter_accept_list() {

  // Autoplumbed

  BTA_DmRestoreFilterAcceptList();

}



void btif_dm_set_default_event_mask() {

  // Autoplumbed

  BTA_DmSetDefaultEventMask();

system/include/hardware/bluetooth.h

+7 −0
Original line number Diff line number Diff line
@@ -818,6 +818,13 @@ typedef struct { 
   *

   */

  int (*set_default_event_mask)();



  /**

   *

   * Floss: Restore the state of the for the filter accept list

   *

   */

  int (*restore_filter_accept_list)();

} bt_interface_t;



#define BLUETOOTH_INTERFACE_STRING "bluetoothInterface"

system/service/hal/fake_bluetooth_interface.cc

+1 −0
Original line number Diff line number Diff line
@@ -86,6 +86,7 @@ bt_interface_t fake_bt_iface = { 
    nullptr, /* clear_filter_accept_list */

    nullptr, /* disconnect_all_acls */

    nullptr, /* le_rand */

    nullptr, /* restore_filter_accept_list */

    nullptr, /* set_default_event_mask */

    nullptr, /* set_event_filter_inquiry_result_all_devices */

};