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

Commit 738bd1b8 authored by Abhishek Pandit-Subedi's avatar Abhishek Pandit-Subedi
Browse files

Add new flag to make discovery classic only 

Discovery starts and stops LE scanning directly, bypassing the LE
scanning interface and causing COMMAND DISALLOWED errors. This change
introduces a new flag that will make discovery only trigger inquiry.
This requires additional changes from upper layers to also trigger BLE
scanning during discovery to get both.

Bug: 274967984
Tag: #floss
Test: Verified with subsequent changes in Floss
Change-Id: I1a8fb3749327a4d968b6cd7057712ec72a4f98f4
parent 8d3c22a8

system/gd/common/init_flags.fbs

+1 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ table InitFlagsData { 
    btaa_hci_is_enabled:bool (privacy:"Any");

    bta_dm_clear_conn_id_on_client_close_is_enabled:bool (privacy:"Any");

    btm_dm_flush_discovery_queue_on_search_cancel_is_enabled:bool (privacy:"Any");

    classic_discovery_only_is_enabled:bool (privacy:"Any");

    clear_hidd_interrupt_cid_on_disconnect_is_enabled:bool (privacy:"Any");

    delay_hidh_cleanup_until_hidh_ready_start_is_enabled:bool (privacy:"Any");

    device_iot_config_logging_is_enabled:bool (privacy:"Any");

system/gd/dumpsys/init_flags.cc

+1 −0
Original line number Diff line number Diff line
@@ -45,6 +45,7 @@ flatbuffers::Offset<bluetooth::common::InitFlagsData> bluetooth::dumpsys::InitFl 
      initFlags::btm_dm_flush_discovery_queue_on_search_cancel_is_enabled());

  builder.add_device_iot_config_logging_is_enabled(

      initFlags::device_iot_config_logging_is_enabled());

  builder.add_classic_discovery_only_is_enabled(initFlags::classic_discovery_only_is_enabled());

  builder.add_clear_hidd_interrupt_cid_on_disconnect_is_enabled(

      initFlags::clear_hidd_interrupt_cid_on_disconnect_is_enabled());

  builder.add_delay_hidh_cleanup_until_hidh_ready_start_is_enabled(

system/gd/rust/common/src/init_flags.rs

+1 −0
Original line number Diff line number Diff line
@@ -257,6 +257,7 @@ init_flags!( 
        btaa_hci = true,

        bta_dm_clear_conn_id_on_client_close = true,

        btm_dm_flush_discovery_queue_on_search_cancel,

        classic_discovery_only,

        clear_hidd_interrupt_cid_on_disconnect = true,

        delay_hidh_cleanup_until_hidh_ready_start = true,

        device_iot_config_logging,

system/gd/rust/shim/src/init_flags.rs

+1 −0
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ mod ffi { 
        fn delay_hidh_cleanup_until_hidh_ready_start_is_enabled() -> bool;

        fn gd_hal_snoop_logger_filtering_is_enabled() -> bool;

        fn btm_dm_flush_discovery_queue_on_search_cancel_is_enabled() -> bool;

        fn classic_discovery_only_is_enabled() -> bool;

        fn clear_hidd_interrupt_cid_on_disconnect_is_enabled() -> bool;

        fn device_iot_config_logging_is_enabled() -> bool;

        fn dynamic_avrcp_version_enhancement_is_enabled() -> bool;

system/main/shim/shim.cc

+4 −0
Original line number Diff line number Diff line
@@ -81,3 +81,7 @@ bool bluetooth::shim::is_gd_dumpsys_module_started() { 
bool bluetooth::shim::is_gd_btaa_enabled() {

  return bluetooth::common::init_flags::btaa_hci_is_enabled();

}



bool bluetooth::shim::is_classic_discovery_only_enabled() {

  return bluetooth::common::init_flags::classic_discovery_only_is_enabled();

}