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

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

InitFlags: Remove flush_discovery_queue_on_search_cancel 

Bug: 247511422
Test: mma -j32
Flag: EXEMPT, no logical change
Change-Id: I32dc8bbd7726ac50ca2b313c51aa7f301b80f6ef
parent 470ed2d7

system/bta/dm/bta_dm_disc_legacy.cc

+1 −7
Original line number Diff line number Diff line
@@ -1035,13 +1035,7 @@ bool bta_dm_is_search_request_queued() { 
 * Returns          void

 *

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

static void bta_dm_search_clear_queue() {

  bta_dm_search_cb.p_pending_search.reset();

  if (bluetooth::common::InitFlags::

          IsBtmDmFlushDiscoveryQueueOnSearchCancel()) {

    bta_dm_search_cb.pending_discovery_queue = {};

  }

}

static void bta_dm_search_clear_queue() { bta_dm_search_cb.p_pending_search.reset(); }



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

 *

system/gd/common/init_flags.h

+0 −4
Original line number Diff line number Diff line
@@ -34,10 +34,6 @@ class InitFlags final { 
    init_flags::load(std::move(rusted_flags));

  }



  inline static bool IsBtmDmFlushDiscoveryQueueOnSearchCancel() {

    return init_flags::btm_dm_flush_discovery_queue_on_search_cancel_is_enabled();

  }



  inline static bool IsTargetedAnnouncementReconnectionMode() {

    return init_flags::leaudio_targeted_announcement_reconnection_mode_is_enabled();

  }

system/gd/common/init_flags_test.cc

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


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_leaudio_targeted_announcement_reconnection_mode) {

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

  InitFlags::Load(input);

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: {

        btm_dm_flush_discovery_queue_on_search_cancel,

        classic_discovery_only,

        dynamic_avrcp_version_enhancement = true,

        gatt_robust_caching_server,

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 btm_dm_flush_discovery_queue_on_search_cancel_is_enabled() -> bool;

        fn classic_discovery_only_is_enabled() -> bool;

        fn dynamic_avrcp_version_enhancement_is_enabled() -> bool;

        fn gatt_robust_caching_server_is_enabled() -> bool;