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

Commit 75485bb4 authored by Łukasz Rymanowski's avatar Łukasz Rymanowski Committed by Gerrit Code Review
Browse files

Merge "bta_dm: Don't clear scheduled service discovery on BTA_DmSearchCancel()"

parents c9c0977c bba553a9

system/bta/dm/bta_dm_act.cc

+5 −1
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ 
#include "btif/include/stack_manager.h"

#include "device/include/controller.h"

#include "device/include/interop.h"

#include "gd/common/init_flags.h"

#include "main/shim/acl_api.h"

#include "main/shim/btm_api.h"

#include "main/shim/dumpsys.h"
@@ -1571,8 +1572,11 @@ bool bta_dm_is_search_request_queued() { 
 ******************************************************************************/

void bta_dm_search_clear_queue() {

  osi_free_and_reset((void**)&bta_dm_search_cb.p_pending_search);

  if (bluetooth::common::InitFlags::

          IsBtmDmFlushDiscoveryQueueOnSearchCancel()) {

    fixed_queue_flush(bta_dm_search_cb.pending_discovery_queue, osi_free);

  }

}



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

 *

system/gd/common/init_flags.fbs

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

    gd_core_enabled:bool (privacy:"Any");

    btaa_hci_log_enabled:bool (privacy:"Any");

    btm_dm_flush_discovery_queue_on_search_cancel_enabled:bool (privacy:"Any");

}



root_type InitFlagsData;

system/gd/common/init_flags.h

+4 −0
Original line number Diff line number Diff line
@@ -44,6 +44,10 @@ class InitFlags final { 
    return init_flags::logging_debug_enabled_for_all_is_enabled();

  }



  inline static bool IsBtmDmFlushDiscoveryQueueOnSearchCancel() {

    return init_flags::btm_dm_flush_discovery_queue_on_search_cancel_is_enabled();

  }



  inline static int GetAdapterIndex() {

    return init_flags::get_hci_adapter();

  }

system/gd/common/init_flags_test.cc

+6 −0
Original line number Diff line number Diff line
@@ -22,6 +22,12 @@ 


using bluetooth::common::InitFlags;



TEST(InitFlagsTest, test_enable_btm_flush_discovery_queue_on_search_cancel) {

  const char* input[] = {"INIT_btm_dm_flush_discovery_queue_on_search_cancel=true", nullptr};

  InitFlags::Load(input);

  ASSERT_TRUE(InitFlags::IsBtmDmFlushDiscoveryQueueOnSearchCancel());

}



TEST(InitFlagsTest, test_enable_debug_logging_for_all) {

  const char* input[] = {"INIT_logging_debug_enabled_for_all=true", nullptr};

  InitFlags::Load(input);

system/gd/dumpsys/init_flags.cc

+2 −0
Original line number Diff line number Diff line
@@ -31,5 +31,7 @@ flatbuffers::Offset<bluetooth::common::InitFlagsData> bluetooth::dumpsys::InitFl 
  builder.add_gd_controller_enabled(true);

  builder.add_gd_core_enabled(bluetooth::common::init_flags::gd_core_is_enabled());

  builder.add_btaa_hci_log_enabled(bluetooth::common::init_flags::btaa_hci_is_enabled());

  builder.add_btm_dm_flush_discovery_queue_on_search_cancel_enabled(

      bluetooth::common::init_flags::btm_dm_flush_discovery_queue_on_search_cancel_is_enabled());

  return builder.Finish();

}