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

Commit 41a7de1d authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge changes I278b58a8,Id93bc848 

* changes:
  Fix incorrect free on InitFlags
  Move all config files to /var/lib/bluetooth
parents a928b68a cfdc6d6c

system/btif/src/btif_config.cc

+5 −1
Original line number Diff line number Diff line
@@ -73,7 +73,11 @@ using bluetooth::common::AddressObfuscator; 
using bluetooth::common::MetricIdAllocator;



// TODO(armansito): Find a better way than searching by a hardcoded path.

#if defined(OS_GENERIC)

#if defined(TARGET_FLOSS)

static const char* CONFIG_FILE_PATH = "/var/lib/bluetooth/bt_config.conf";

static const char* CONFIG_BACKUP_PATH = "/var/lib/bluetooth/bt_config.bak";

static const char* CONFIG_LEGACY_FILE_PATH = "/var/lib/bluetooth/bt_config.xml";

#elif defined(OS_GENERIC)

static const char* CONFIG_FILE_PATH = "bt_config.conf";

static const char* CONFIG_BACKUP_PATH = "bt_config.bak";

static const char* CONFIG_LEGACY_FILE_PATH = "bt_config.xml";

system/btif/src/btif_core.cc

+3 −1
Original line number Diff line number Diff line
@@ -69,7 +69,9 @@ static void bt_jni_msg_ready(void* context); 


#ifndef BTE_DID_CONF_FILE

// TODO(armansito): Find a better way than searching by a hardcoded path.

#if defined(OS_GENERIC) && !defined(TARGET_FLOSS)

#if defined(TARGET_FLOSS)

#define BTE_DID_CONF_FILE "/var/lib/bluetooth/bt_did.conf"

#elif defined(OS_GENERIC)

#define BTE_DID_CONF_FILE "bt_did.conf"

#else  // !defined(OS_GENERIC)

#define BTE_DID_CONF_FILE "/etc/bluetooth/bt_did.conf"

system/gd/BUILD.gn

+1 −0
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ config("gd_defaults") { 
  defines = [

    "OS_LINUX_GENERIC",

    "OS_GENERIC",

    "TARGET_FLOSS",

  ]



  libs = [

system/gd/os/linux/parameter_provider.cc

+3 −3
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ std::string ParameterProvider::ConfigFilePath() { 
      return config_file_path;

    }

  }

  return "/etc/bluetooth/bt_config.conf";

  return "/var/lib/bluetooth/bt_config.conf";

}



void ParameterProvider::OverrideConfigFilePath(const std::string& path) {
@@ -58,7 +58,7 @@ std::string ParameterProvider::SnoopLogFilePath() { 
    }

  }



  return "/etc/bluetooth/btsnoop_hci.log";

  return "/var/log/bluetooth/btsnoop_hci.log";

}



void ParameterProvider::OverrideSnoopLogFilePath(const std::string& path) {
@@ -73,7 +73,7 @@ std::string ParameterProvider::SnoozLogFilePath() { 
      return snooz_log_file_path;

    }

  }

  return "/etc/bluetooth/btsnooz_hci.log";

  return "/var/log/bluetooth/btsnooz_hci.log";

}



}  // namespace os

system/gd/rust/topshim/btif/btif_shim.cc

+3 −4
Original line number Diff line number Diff line
@@ -31,9 +31,8 @@ namespace rust { 
InitFlags::InitFlags() {}

InitFlags::~InitFlags() {

  if (flags_) {

    int i = 0;

    for (const char* flag = flags_[i]; flags_[i] != nullptr; ++i) {

      std::free(const_cast<void*>(static_cast<const void*>(flag)));

    for (int i = 0; flags_[i] != nullptr; ++i) {

      std::free(const_cast<void*>(static_cast<const void*>(flags_[i])));

    }



    std::free(const_cast<void*>(static_cast<const void*>(flags_)));
@@ -48,7 +47,7 @@ void InitFlags::Convert(::rust::Vec<::rust::String>& initFlags) { 


  for (int i = 0; i < initFlags.size(); ++i) {

    flags_[i] = strndup(initFlags[i].data(), initFlags[i].size());

    if (!flags_) {

    if (!flags_[i]) {

      return;

    }

  }