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

Commit 6aeffa51 authored by Aritra Sen's avatar Aritra Sen Committed by Automerger Merge Worker
Browse files

Merge "Remove the use of gd_l2cap flag across our codebase." into main am: 22868b72 

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/2755920



Change-Id: I7c5373f5acad3c99170b5d13c0cc548528bdc485
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 3eac4cf8 22868b72

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

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

        gatt_robust_caching_client = true,

        gatt_robust_caching_server,

        gd_l2cap,

        hci_adapter: i32,

        hfp_dynamic_version = true,

        irk_rotation,

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

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

        fn gatt_robust_caching_client_is_enabled() -> bool;

        fn gatt_robust_caching_server_is_enabled() -> bool;

        fn gd_l2cap_is_enabled() -> bool;

        fn get_default_log_level() -> i32;

        fn get_hci_adapter() -> i32;

        fn get_log_level_for_tag(tag: &str) -> i32;

system/main/shim/shim.cc

+0 −4
Original line number Diff line number Diff line
@@ -61,10 +61,6 @@ EXPORT_SYMBOL extern const module_t gd_shim_module = { 
    .clean_up = kUnusedModuleApi,

    .dependencies = {kUnusedModuleDependencies}};



bool bluetooth::shim::is_gd_l2cap_enabled() {

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

}



bool bluetooth::shim::is_gd_stack_started_up() {

  return bluetooth::shim::Stack::GetInstance()->IsRunning();

}

system/main/shim/shim.h

+0 −14
Original line number Diff line number Diff line
@@ -32,20 +32,6 @@ constexpr char* kUnusedModuleDependencies = nullptr; 
namespace bluetooth {

namespace shim {



/**

 * Checks if the bluetooth stack is running in legacy or gd mode.

 *

 * This check is used throughout the legacy stack to determine which

 * methods, classes or functions to invoke.  The default (false) mode

 * is the legacy mode which runs the original legacy bluetooth stack.

 * When enabled (true) the core portion of the gd stack is invoked

 * at key points to execute equivalent functionality using the

 * gd core components.

 *

 * @return true if using gd shim core, false if using legacy.

 */

bool is_gd_l2cap_enabled();



/**

 * Checks if the bluetooth gd stack has been started up.

 *

system/main/shim/stack.cc

+0 −9
Original line number Diff line number Diff line
@@ -91,11 +91,6 @@ void Stack::StartEverything() { 
  modules.add<hci::acl_manager::AclScheduler>();

  modules.add<hci::AclManager>();

  modules.add<hci::RemoteNameRequestModule>();

  if (common::init_flags::gd_l2cap_is_enabled()) {

    modules.add<l2cap::classic::L2capClassicModule>();

    modules.add<l2cap::le::L2capLeModule>();

    modules.add<hci::LeAdvertisingManager>();

  }

  modules.add<hci::LeAdvertisingManager>();

  modules.add<hci::MsftExtensionManager>();

  modules.add<hci::LeScanningManager>();
@@ -118,10 +113,6 @@ void Stack::StartEverything() { 
  bluetooth::shim::init_advertising_manager();

  bluetooth::shim::init_scanning_manager();

  bluetooth::shim::init_distance_measurement_manager();



  if (common::init_flags::gd_l2cap_is_enabled()) {

    L2CA_UseLegacySecurityModule();

  }

}



void Stack::Start(ModuleList* modules) {