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

Commit 5d357b18 authored by Myles Watson's avatar Myles Watson
Browse files

InitFlags: Remove use_rsi_from_cached_inquiry_results 

Bug: 285191013
Fixes: 290847050
Test: mma -j32
Flag: EXEMPT, no logical change
Change-Id: Iafd3237dcc9b3bdfb7ffb3ad2fdb131745c5d14c
parent cef1de02

system/bta/csis/csis_client.cc

+0 −5
Original line number Diff line number Diff line
@@ -36,7 +36,6 @@ 
#include "bta_le_audio_uuids.h"

#include "bta_sec_api.h"

#include "btif/include/btif_storage.h"

#include "common/init_flags.h"

#include "crypto_toolbox/crypto_toolbox.h"

#include "csis_types.h"

#include "gap_api.h"
@@ -1430,10 +1429,6 @@ private: 
  }



  void CsisActiveDiscovery(std::shared_ptr<CsisGroup> csis_group) {

    if (bluetooth::common::InitFlags::UseRsiFromCachedInquiryResults()) {

      CheckForGroupInInqDb(csis_group);

    }



    if (csis_group->GetDiscoveryState() != CsisDiscoveryState::CSIS_DISCOVERY_IDLE) {

      log::error("Incorrect ase group: {}, state 0x{:02x}", csis_group->GetGroupId(),

                 static_cast<int>(csis_group->GetDiscoveryState()));

system/gd/common/init_flags.h

+0 −6
Original line number Diff line number Diff line
@@ -16,8 +16,6 @@ 


#pragma once



#include <string>



#include "src/init_flags.rs.h"



namespace bluetooth {
@@ -34,10 +32,6 @@ public: 
    init_flags::load(std::move(rusted_flags));

  }



  inline static bool UseRsiFromCachedInquiryResults() {

    return init_flags::use_rsi_from_cached_inqiry_results_is_enabled();

  }



  inline static int GetAdapterIndex() { return init_flags::get_hci_adapter(); }



  inline static void SetAllForTesting() { init_flags::set_all_for_testing(); }

system/gd/common/init_flags_test.cc

+1 −11
Original line number Diff line number Diff line
@@ -16,14 +16,4 @@ 
 *

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



#include "common/init_flags.h"



#include <gtest/gtest.h>
 
 No newline at end of file
 


using bluetooth::common::InitFlags;



TEST(InitFlagsTest, test_enable_use_rsi_from_cached_inqiry_results) {

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

  InitFlags::Load(input);

  ASSERT_TRUE(InitFlags::UseRsiFromCachedInquiryResults());

}

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

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

        hci_adapter: i32,

        use_unified_connection_manager,

        use_rsi_from_cached_inqiry_results = false,

        att_mtu_default: i32 = 517,

    }

    extra_parsed_flags: {

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

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

        fn get_hci_adapter() -> i32;

        fn use_unified_connection_manager_is_enabled() -> bool;

        fn use_rsi_from_cached_inqiry_results_is_enabled() -> bool;

        fn get_att_mtu_default() -> i32;

    }

}