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

Commit eb389d3a authored by Myles Watson's avatar Myles Watson
Browse files

InitFlags: Remove always_send_services_...gatt 

Bug: 263050668
Fixes: 290842852
Test: mma -j32
Flag: EXEMPT, no logical change
Change-Id: Ie771d51e9060df2e91eb4021871343208c665226
parent 58ebd048

system/bta/dm/bta_dm_disc_legacy.cc

+1 −5
Original line number Diff line number Diff line
@@ -843,11 +843,7 @@ static void bta_dm_search_cmpl() { 


  std::vector<Uuid> gatt_services;



  bool send_gatt_results =

      bluetooth::common::init_flags::

              always_send_services_if_gatt_disc_done_is_enabled()

          ? bta_dm_search_cb.gatt_disc_active

          : false;

  bool send_gatt_results = bta_dm_search_cb.gatt_disc_active;



  /* no BLE connection, i.e. Classic service discovery end */

  if (conn_id == GATT_INVALID_CONN_ID) {

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

+0 −1
Original line number Diff line number Diff line
@@ -207,7 +207,6 @@ pub fn set_all_for_testing() { 
init_flags!(

    name: InitFlags

    flags: {

        always_send_services_if_gatt_disc_done = true,

        always_use_private_gatt_for_debugging,

        bluetooth_power_telemetry = false,

        btm_dm_flush_discovery_queue_on_search_cancel,

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

+0 −1
Original line number Diff line number Diff line
@@ -12,7 +12,6 @@ mod ffi { 


        fn dump() -> Vec<InitFlagWithValue>;



        fn always_send_services_if_gatt_disc_done_is_enabled() -> bool;

        fn always_use_private_gatt_for_debugging_is_enabled() -> bool;

        fn bluetooth_power_telemetry_is_enabled() -> bool;

        fn btm_dm_flush_discovery_queue_on_search_cancel_is_enabled() -> bool;