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

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

legacy: Final remove is_any_gd_enabled am: 11ca0bba am: 84a18b0b am: 7b6e80b7 am: d9102165 

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

Change-Id: Ief4132817d948a78de848a4b6f512981a5f0f048
parents fc1725cc d9102165

system/btif/src/bluetooth.cc

+9 −14
Original line number Diff line number Diff line
@@ -180,7 +180,6 @@ static int init(bt_callbacks_t* callbacks, bool start_restricted, 


  restricted_mode = start_restricted;



  if (bluetooth::shim::is_any_gd_enabled()) {

  bluetooth::os::ParameterProvider::SetBtKeystoreInterface(

      bluetooth::bluetooth_keystore::getBluetoothKeystoreInterface());

  bluetooth::os::ParameterProvider::SetCommonCriteriaMode(
@@ -192,10 +191,6 @@ static int init(bt_callbacks_t* callbacks, bool start_restricted, 
    bluetooth::os::ParameterProvider::SetCommonCriteriaConfigCompareResult(

        CONFIG_COMPARE_ALL_PASS);

  }

  } else {

    common_criteria_mode = is_common_criteria_mode;

    common_criteria_config_compare_result = config_compare_result;

  }



  is_local_device_atv = is_atv;

system/btif/src/btif_keystore.cc

+3 −8
Original line number Diff line number Diff line
@@ -61,15 +61,10 @@ class BluetoothKeystoreInterfaceImpl 
      LOG(INFO) << __func__ << " callback isn't ready.";

      return;

    }

    if (bluetooth::shim::is_any_gd_enabled()) {

    do_in_jni_thread(

        FROM_HERE, base::Bind([]() {

          shim::BtifConfigInterface::ConvertEncryptOrDecryptKeyIfNeeded();

        }));

      return;

    }

    do_in_jni_thread(

        FROM_HERE, base::Bind([]() { btif_storage_get_num_bonded_devices(); }));

  }



  bool set_encrypt_key_or_remove_key(std::string prefix,

system/gd/dumpsys/init_flags.cc

+1 −1
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ flatbuffers::Offset<bluetooth::common::InitFlagsData> bluetooth::dumpsys::InitFl 
  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_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(true);

  builder.add_gd_hci_enabled(true);

  builder.add_gd_controller_enabled(true);

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

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

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



/// Deprecated immutable flag

pub fn gd_acl_is_enabled() -> bool {

    true

}



macro_rules! init_flags {

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

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

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

        fn gd_advertising_is_enabled() -> bool;

        fn gd_scanning_is_enabled() -> bool;

        fn gd_acl_is_enabled() -> bool;

        fn gd_l2cap_is_enabled() -> bool;

        fn gatt_robust_caching_is_enabled() -> bool;

        fn btaa_hci_is_enabled() -> bool;