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

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

Merge "GD-Integration: Enable HCI layer only for GD" am: 2b7febca 

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

Change-Id: I88a171f1ab521fec732b5d4cd74f7ba70c3715eb
parents 6a539825 2b7febca

system/btcore/src/module.cc

+6 −5
Original line number Diff line number Diff line
@@ -18,6 +18,8 @@ 


#define LOG_TAG "bt_core_module"



#include "btcore/include/module.h"



#include <base/logging.h>

#include <dlfcn.h>

#include <string.h>
@@ -25,7 +27,6 @@ 
#include <mutex>

#include <unordered_map>



#include "btcore/include/module.h"

#include "common/message_loop_thread.h"

#include "osi/include/allocator.h"

#include "osi/include/log.h"
@@ -50,9 +51,7 @@ static void set_module_state(const module_t* module, module_state_t state); 


void module_management_start(void) {}



void module_management_stop(void) {

  metadata.clear();

}

void module_management_stop(void) { metadata.clear(); }



const module_t* get_module(const char* name) {

  module_t* module = (module_t*)dlsym(RTLD_DEFAULT, name);
@@ -163,7 +162,9 @@ class CallbackWrapper { 
                           MessageLoopThread* callback_thread,

                           thread_fn callback)

      : module(module),

        lifecycle_thread("bt_module_lifecycle_thread"),

        lifecycle_thread(std::string("bt_module_lifecycle_thread[") +

                         (module->name != nullptr ? module->name : "unknown") +

                         "]"),

        callback_thread(callback_thread),

        callback(callback),

        success(false) {}

system/btif/src/bluetooth.cc

+5 −6
Original line number Diff line number Diff line
@@ -27,11 +27,6 @@ 
#define LOG_TAG "bt_btif"



#include <base/logging.h>

#include <stdio.h>

#include <stdlib.h>

#include <string.h>

#include <unistd.h>



#include <hardware/bluetooth.h>

#include <hardware/bluetooth_headset_interface.h>

#include <hardware/bt_av.h>
@@ -45,6 +40,10 @@ 
#include <hardware/bt_rc.h>

#include <hardware/bt_sdp.h>

#include <hardware/bt_sock.h>

#include <stdio.h>

#include <stdlib.h>

#include <string.h>

#include <unistd.h>



#include "bt_utils.h"

#include "bta/include/bta_hearing_aid_api.h"
@@ -338,7 +337,7 @@ static void dump(int fd, const char** arguments) { 
  HearingAid::DebugDump(fd);

  connection_manager::dump(fd);

  bluetooth::bqr::DebugDump(fd);

  if (bluetooth::shim::is_gd_shim_enabled()) {

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

    bluetooth::shim::Dump(fd, arguments);

  } else {

#if (BTSNOOP_MEM == TRUE)

system/btif/src/btif_config.cc

+22 −24
Original line number Diff line number Diff line
@@ -20,7 +20,11 @@ 


#include "btif_config.h"



#include <base/logging.h>

#include <openssl/rand.h>

#include <private/android_filesystem_config.h>

#include <unistd.h>



#include <cctype>

#include <cstdio>

#include <cstring>
@@ -31,12 +35,6 @@ 
#include <string>

#include <unordered_map>



#include <private/android_filesystem_config.h>



#include <openssl/rand.h>



#include <base/logging.h>



#include "btcore/include/module.h"

#include "btif_api.h"

#include "btif_common.h"
@@ -251,7 +249,7 @@ static BtifConfigCache btif_config_cache(TEMPORARY_SECTION_CAPACITY); 
// Module lifecycle functions



static future_t* init(void) {

  if (bluetooth::shim::is_gd_shim_enabled()) {

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

    CHECK(bluetooth::shim::is_gd_stack_started_up());

    // TODO (b/158035889) Migrate metrics module to GD

    read_or_set_metrics_salt();
@@ -364,7 +362,7 @@ static future_t* shut_down(void) { 
}



static future_t* clean_up(void) {

  if (bluetooth::shim::is_gd_shim_enabled()) {

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

    CHECK(bluetooth::shim::is_gd_stack_started_up());

    // GD storage module cleanup by itself

    std::unique_lock<std::recursive_mutex> lock(config_lock);
@@ -390,7 +388,7 @@ EXPORT_SYMBOL module_t btif_config_module = {.name = BTIF_CONFIG_MODULE, 
                                             .clean_up = clean_up};



bool btif_config_exist(const std::string& section, const std::string& key) {

  if (bluetooth::shim::is_gd_shim_enabled()) {

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

    CHECK(bluetooth::shim::is_gd_stack_started_up());

    return bluetooth::shim::BtifConfigInterface::HasProperty(section, key);

  }
@@ -400,7 +398,7 @@ bool btif_config_exist(const std::string& section, const std::string& key) { 


bool btif_config_get_int(const std::string& section, const std::string& key,

                         int* value) {

  if (bluetooth::shim::is_gd_shim_enabled()) {

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

    CHECK(bluetooth::shim::is_gd_stack_started_up());

    return bluetooth::shim::BtifConfigInterface::GetInt(section, key, value);

  }
@@ -416,7 +414,7 @@ bool btif_config_get_int(const std::string& section, const std::string& key, 


bool btif_config_set_int(const std::string& section, const std::string& key,

                         int value) {

  if (bluetooth::shim::is_gd_shim_enabled()) {

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

    CHECK(bluetooth::shim::is_gd_stack_started_up());

    return bluetooth::shim::BtifConfigInterface::SetInt(section, key, value);

  }
@@ -427,7 +425,7 @@ bool btif_config_set_int(const std::string& section, const std::string& key, 


bool btif_config_get_uint64(const std::string& section, const std::string& key,

                            uint64_t* value) {

  if (bluetooth::shim::is_gd_shim_enabled()) {

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

    CHECK(bluetooth::shim::is_gd_stack_started_up());

    return bluetooth::shim::BtifConfigInterface::GetUint64(section, key, value);

  }
@@ -443,7 +441,7 @@ bool btif_config_get_uint64(const std::string& section, const std::string& key, 


bool btif_config_set_uint64(const std::string& section, const std::string& key,

                            uint64_t value) {

  if (bluetooth::shim::is_gd_shim_enabled()) {

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

    CHECK(bluetooth::shim::is_gd_stack_started_up());

    return bluetooth::shim::BtifConfigInterface::SetUint64(section, key, value);

  }
@@ -454,7 +452,7 @@ bool btif_config_set_uint64(const std::string& section, const std::string& key, 


bool btif_config_get_str(const std::string& section, const std::string& key,

                         char* value, int* size_bytes) {

  if (bluetooth::shim::is_gd_shim_enabled()) {

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

    CHECK(bluetooth::shim::is_gd_stack_started_up());

    return bluetooth::shim::BtifConfigInterface::GetStr(section, key, value,

                                                        size_bytes);
@@ -474,7 +472,7 @@ bool btif_config_get_str(const std::string& section, const std::string& key, 


bool btif_config_set_str(const std::string& section, const std::string& key,

                         const std::string& value) {

  if (bluetooth::shim::is_gd_shim_enabled()) {

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

    CHECK(bluetooth::shim::is_gd_stack_started_up());

    return bluetooth::shim::BtifConfigInterface::SetStr(section, key, value);

  }
@@ -491,7 +489,7 @@ static bool btif_in_encrypt_key_name_list(std::string key) { 


bool btif_config_get_bin(const std::string& section, const std::string& key,

                         uint8_t* value, size_t* length) {

  if (bluetooth::shim::is_gd_shim_enabled()) {

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

    CHECK(bluetooth::shim::is_gd_stack_started_up());

    return bluetooth::shim::BtifConfigInterface::GetBin(section, key, value,

                                                        length);
@@ -556,7 +554,7 @@ bool btif_config_get_bin(const std::string& section, const std::string& key, 


size_t btif_config_get_bin_length(const std::string& section,

                                  const std::string& key) {

  if (bluetooth::shim::is_gd_shim_enabled()) {

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

    CHECK(bluetooth::shim::is_gd_stack_started_up());

    return bluetooth::shim::BtifConfigInterface::GetBinLength(section, key);

  }
@@ -569,7 +567,7 @@ size_t btif_config_get_bin_length(const std::string& section, 


bool btif_config_set_bin(const std::string& section, const std::string& key,

                         const uint8_t* value, size_t length) {

  if (bluetooth::shim::is_gd_shim_enabled()) {

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

    CHECK(bluetooth::shim::is_gd_stack_started_up());

    return bluetooth::shim::BtifConfigInterface::SetBin(section, key, value,

                                                        length);
@@ -611,7 +609,7 @@ bool btif_config_set_bin(const std::string& section, const std::string& key, 


std::vector<RawAddress> btif_config_get_paired_devices() {

  std::vector<std::string> names;

  if (bluetooth::shim::is_gd_shim_enabled()) {

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

    CHECK(bluetooth::shim::is_gd_stack_started_up());

    names = bluetooth::shim::BtifConfigInterface::GetPersistentDevices();

  } else {
@@ -632,7 +630,7 @@ std::vector<RawAddress> btif_config_get_paired_devices() { 
}



bool btif_config_remove(const std::string& section, const std::string& key) {

  if (bluetooth::shim::is_gd_shim_enabled()) {

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

    CHECK(bluetooth::shim::is_gd_stack_started_up());

    return bluetooth::shim::BtifConfigInterface::RemoveProperty(section, key);

  }
@@ -645,7 +643,7 @@ bool btif_config_remove(const std::string& section, const std::string& key) { 
}



void btif_config_save(void) {

  if (bluetooth::shim::is_gd_shim_enabled()) {

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

    CHECK(bluetooth::shim::is_gd_stack_started_up());

    bluetooth::shim::BtifConfigInterface::Save();

    return;
@@ -656,7 +654,7 @@ void btif_config_save(void) { 
}



void btif_config_flush(void) {

  if (bluetooth::shim::is_gd_shim_enabled()) {

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

    CHECK(bluetooth::shim::is_gd_stack_started_up());

    bluetooth::shim::BtifConfigInterface::Flush();

    return;
@@ -668,7 +666,7 @@ void btif_config_flush(void) { 
}



bool btif_config_clear(void) {

  if (bluetooth::shim::is_gd_shim_enabled()) {

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

    CHECK(bluetooth::shim::is_gd_stack_started_up());

    bluetooth::shim::BtifConfigInterface::Clear();

    bluetooth::shim::BtifConfigInterface::Save();
@@ -735,7 +733,7 @@ void btif_debug_config_dump(int fd) { 


  std::optional<std::string> file_source;

  if (bluetooth::shim::is_gd_stack_started_up()) {

    CHECK(bluetooth::shim::is_gd_shim_enabled());

    CHECK(bluetooth::shim::is_any_gd_enabled());

    file_source =

        bluetooth::shim::BtifConfigInterface::GetStr(INFO_SECTION, FILE_SOURCE);

  } else {

system/btif/src/stack_manager.cc

+1 −1
Original line number Diff line number Diff line
@@ -113,7 +113,7 @@ static void event_init_stack(void* context) { 


    module_init(get_module(OSI_MODULE));

    module_init(get_module(BT_UTILS_MODULE));

    if (bluetooth::shim::is_gd_shim_enabled()) {

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

      module_start_up(get_module(GD_IDLE_MODULE));

    }

    module_init(get_module(BTIF_CONFIG_MODULE));

system/device/include/controller.h

+0 −6
Original line number Diff line number Diff line
@@ -119,12 +119,6 @@ typedef struct controller_t { 


} controller_t;



namespace bluetooth {

namespace legacy {

const controller_t* controller_get_interface();

}  // namespace legacy

}  // namespace bluetooth



const controller_t* controller_get_interface();



const controller_t* controller_get_test_interface(