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

Commit f9943e46 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "legacy: Final removal gd_scan gd_advert" am: f5757703 am: 29a5fef7... 

Merge "legacy: Final removal gd_scan gd_advert" am: f5757703 am: 29a5fef7 am: 58ebaa3b am: b2e47181

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

Change-Id: I904332393588446ce083a0b4082eea2d19f5261e
parents b07b5814 b2e47181

system/gd/dumpsys/init_flags.cc

+2 −2
Original line number Diff line number Diff line
@@ -23,8 +23,8 @@ flatbuffers::Offset<bluetooth::common::InitFlagsData> bluetooth::dumpsys::InitFl 
  auto title = fb_builder->CreateString("----- Init Flags -----");

  common::InitFlagsDataBuilder builder(*fb_builder);

  builder.add_title(title);

  builder.add_gd_advertising_enabled(bluetooth::common::init_flags::gd_advertising_is_enabled());

  builder.add_gd_scanning_enabled(bluetooth::common::init_flags::gd_scanning_is_enabled());

  builder.add_gd_advertising_enabled(true);

  builder.add_gd_scanning_enabled(true);

  builder.add_gd_security_enabled(bluetooth::common::init_flags::gd_security_is_enabled());

  builder.add_gd_acl_enabled(true);

  builder.add_gd_hci_enabled(true);

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

+0 −9
Original line number Diff line number Diff line
@@ -2,15 +2,6 @@ use log::{error, info}; 
use paste::paste;

use std::sync::Mutex;



/// Deprecated immutable flag

pub fn gd_advertising_is_enabled() -> bool {

    true

}

/// Deprecated immutable flag

pub fn gd_scanning_is_enabled() -> bool {

    true

}



macro_rules! init_flags {

    (flags: { $($flag:ident),* }, dependencies: { $($parent:ident => $child:ident),* }) => {

        #[derive(Default)]

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

+0 −2
Original line number Diff line number Diff line
@@ -6,8 +6,6 @@ mod ffi { 


        fn gd_core_is_enabled() -> bool;

        fn gd_security_is_enabled() -> bool;

        fn gd_advertising_is_enabled() -> bool;

        fn gd_scanning_is_enabled() -> bool;

        fn gd_l2cap_is_enabled() -> bool;

        fn gatt_robust_caching_is_enabled() -> bool;

        fn btaa_hci_is_enabled() -> bool;

system/main/shim/shim.cc

+0 −8
Original line number Diff line number Diff line
@@ -54,14 +54,6 @@ EXPORT_SYMBOL extern const module_t gd_shim_module = { 
    .clean_up = kUnusedModuleApi,

    .dependencies = {kUnusedModuleDependencies}};



bool bluetooth::shim::is_gd_advertising_enabled() {

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

}



bool bluetooth::shim::is_gd_scanning_enabled() {

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

}



bool bluetooth::shim::is_gd_security_enabled() {

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

}

system/main/shim/shim.h

+0 −2
Original line number Diff line number Diff line
@@ -45,8 +45,6 @@ namespace shim { 
 *

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

 */

bool is_gd_advertising_enabled();

bool is_gd_scanning_enabled();

bool is_gd_security_enabled();

bool is_gd_link_policy_enabled();

bool is_gd_l2cap_enabled();