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

Commit fdb4d768 authored by Martin Brabham's avatar Martin Brabham
Browse files

Floss: ClearFilterAcceptList BTIF API 

Add the ability to clear the connect list from the application layer.

Bug: 224603601
Test: mma -j $(nproc)
Test: ./build.py
Tag: #floss
Change-Id: Iec642cda5a7f1b92e699f98821e03bc48534dc97
parent 6f1ec29d

system/btif/src/bluetooth.cc

+11 −1
Original line number Diff line number Diff line
@@ -429,6 +429,15 @@ static int clear_event_mask() { 
  return BT_STATUS_SUCCESS;

}



static int clear_filter_accept_list() {

  LOG_VERBOSE("%s", __func__);

  if (!interface_ready()) return BT_STATUS_NOT_READY;



  do_in_main_thread(FROM_HERE,

                    base::BindOnce(btif_dm_clear_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);
@@ -684,7 +693,8 @@ EXPORT_SYMBOL bt_interface_t bluetoothInterface = { 
    generate_local_oob_data,

    allow_low_latency_audio,

    clear_event_filter,

    clear_event_mask};

    clear_event_mask,

    clear_filter_accept_list};



// callback reporting helpers

system/include/hardware/bluetooth.h

+5 −0
Original line number Diff line number Diff line
@@ -785,6 +785,11 @@ typedef struct { 
   * Call to clear event mask

   */

  int (*clear_event_mask)();



  /**

   * Call to clear out the connect list

   */

  int (*clear_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
@@ -83,6 +83,7 @@ bt_interface_t fake_bt_iface = { 
    nullptr, /* allow_low_latency_audio */

    nullptr, /* clear_event_filter */

    nullptr, /* clear_event_mask */

    nullptr, /* clear_filter_accept_list */

};



}  // namespace

system/test/mock/mock_bluetooth_interface.cc

+4 −1
Original line number Diff line number Diff line
@@ -153,6 +153,8 @@ static int clear_event_filter(void) { return 0; } 


static int clear_event_mask() { return 0; }



static int clear_filter_accept_list() { return 0; }



EXPORT_SYMBOL bt_interface_t bluetoothInterface = {

    sizeof(bluetoothInterface),

    init,
@@ -194,7 +196,8 @@ EXPORT_SYMBOL bt_interface_t bluetoothInterface = { 
    generate_local_oob_data,

    allow_low_latency_audio,

    clear_event_filter,

    clear_event_mask};

    clear_event_mask,

    clear_filter_accept_list};



// callback reporting helpers