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

Commit ae556093 authored by Chris Manton's avatar Chris Manton Committed by Automerger Merge Worker
Browse files

Final removal of gd_hci_enabled flag am: be865572 

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1821382

Change-Id: I6bd54d84ea47ce7f775bca10f5b4487a6a2211b1
parents 5fc3ccd4 be865572

system/gd/dumpsys/init_flags.cc

+1 −1
Original line number Original line Diff line number Diff line
@@ -27,7 +27,7 @@ flatbuffers::Offset<bluetooth::common::InitFlagsData> bluetooth::dumpsys::InitFl 
  builder.add_gd_scanning_enabled(bluetooth::common::init_flags::gd_scanning_is_enabled());

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

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

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

  builder.add_gd_acl_enabled(bluetooth::common::init_flags::gd_acl_is_enabled());

  builder.add_gd_acl_enabled(bluetooth::common::init_flags::gd_acl_is_enabled());

  builder.add_gd_hci_enabled(bluetooth::common::init_flags::gd_hci_is_enabled());

  builder.add_gd_hci_enabled(true);

  builder.add_gd_controller_enabled(bluetooth::common::init_flags::gd_controller_is_enabled());

  builder.add_gd_controller_enabled(bluetooth::common::init_flags::gd_controller_is_enabled());

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

  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_btaa_hci_log_enabled(bluetooth::common::init_flags::btaa_hci_is_enabled());

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

+1 −3
Original line number Original line Diff line number Diff line
@@ -3,9 +3,7 @@ use paste::paste; 
use std::sync::Mutex;

use std::sync::Mutex;





/// Deprecated immutable flag

/// Deprecated immutable flag

pub fn gd_hci_is_enabled() -> bool {

/// NONE at this time

    true

}





macro_rules! init_flags {

macro_rules! init_flags {

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

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

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

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

        fn gd_scanning_is_enabled() -> bool;

        fn gd_acl_is_enabled() -> bool;

        fn gd_acl_is_enabled() -> bool;

        fn gd_l2cap_is_enabled() -> bool;

        fn gd_l2cap_is_enabled() -> bool;

        fn gd_hci_is_enabled() -> bool;

        fn gd_controller_is_enabled() -> bool;

        fn gd_controller_is_enabled() -> bool;

        fn gatt_robust_caching_is_enabled() -> bool;

        fn gatt_robust_caching_is_enabled() -> bool;

        fn btaa_hci_is_enabled() -> bool;

        fn btaa_hci_is_enabled() -> bool;

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

+0 −1
Original line number Original line Diff line number Diff line
@@ -58,7 +58,6 @@ pub fn stack_stop(stack: &mut Stack) { 




pub fn get_hci(stack: &mut Stack) -> Box<Hci> {

pub fn get_hci(stack: &mut Stack) -> Box<Hci> {

    assert!(init_flags::gd_rust_is_enabled());

    assert!(init_flags::gd_rust_is_enabled());

    assert!(init_flags::gd_hci_is_enabled());





    Box::new(Hci::new(

    Box::new(Hci::new(

        stack.get_runtime(),

        stack.get_runtime(),

system/main/shim/hci_layer.cc

+1 −3
Original line number Original line Diff line number Diff line
@@ -167,9 +167,7 @@ static bool event_already_registered_in_hci_layer( 
    case bluetooth::hci::EventCode::PAGE_SCAN_REPETITION_MODE_CHANGE:

    case bluetooth::hci::EventCode::PAGE_SCAN_REPETITION_MODE_CHANGE:

    case bluetooth::hci::EventCode::MAX_SLOTS_CHANGE:

    case bluetooth::hci::EventCode::MAX_SLOTS_CHANGE:

    case bluetooth::hci::EventCode::LE_META_EVENT:

    case bluetooth::hci::EventCode::LE_META_EVENT:

      return bluetooth::common::init_flags::gd_hci_is_enabled() ||

      return true;

             bluetooth::shim::is_gd_acl_enabled() ||

             bluetooth::shim::is_gd_l2cap_enabled();

    case bluetooth::hci::EventCode::DISCONNECTION_COMPLETE:

    case bluetooth::hci::EventCode::DISCONNECTION_COMPLETE:

    case bluetooth::hci::EventCode::READ_REMOTE_VERSION_INFORMATION_COMPLETE:

    case bluetooth::hci::EventCode::READ_REMOTE_VERSION_INFORMATION_COMPLETE:

      return bluetooth::shim::is_gd_acl_enabled() ||

      return bluetooth::shim::is_gd_acl_enabled() ||