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

Commit ccf4d0c8 authored by Henri Chataing's avatar Henri Chataing Committed by Automerger Merge Worker
Browse files

Merge changes I9412e132,I90f3977a into main am: a57e6702 am: 138e73ae 

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



Change-Id: I3b135c4120113ffe6ad5eba35b7bc98edbaf6842
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 703a5c47 138e73ae

system/btcore/BUILD.gn

+5 −1
Original line number Diff line number Diff line
@@ -28,7 +28,10 @@ static_library("btcore") { 
    "//bt/system",

  ]



  configs += [ "//bt/system:target_defaults" ]

  configs += [

    "//bt/system:target_defaults",

    "//bt/system/log:log_defaults",

  ]



  deps = [

    "//bt/system/gd/rust/shim:init_flags_bridge_header",
@@ -57,6 +60,7 @@ if (use.test) { 
    configs += [

      "//bt/system:external_gtest_main",

      "//bt/system:target_defaults",

      "//bt/system/log:log_defaults",

    ]



    libs = [

system/btcore/src/module.cc

+14 −12
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ 
#include "btcore/include/module.h"



#include <base/logging.h>

#include <bluetooth/log.h>

#include <dlfcn.h>

#include <string.h>
@@ -32,6 +33,7 @@ 
#include "os/log.h"



using bluetooth::common::MessageLoopThread;

using namespace bluetooth;



typedef enum {

  MODULE_STATE_NONE = 0,
@@ -63,7 +65,7 @@ bool module_init(const module_t* module) { 
  CHECK(get_module_state(module) == MODULE_STATE_NONE);



  if (!call_lifecycle_function(module->init)) {

    LOG_ERROR("%s Failed to initialize module \"%s\"", __func__, module->name);

    log::error("Failed to initialize module \"{}\"", module->name);

    return false;

  }
@@ -81,12 +83,12 @@ bool module_start_up(const module_t* module) { 
  CHECK(get_module_state(module) == MODULE_STATE_INITIALIZED ||

        module->init == NULL);



  LOG_INFO("%s Starting module \"%s\"", __func__, module->name);

  log::info("Starting module \"{}\"", module->name);

  if (!call_lifecycle_function(module->start_up)) {

    LOG_ERROR("%s Failed to start up module \"%s\"", __func__, module->name);

    log::error("Failed to start up module \"{}\"", module->name);

    return false;

  }

  LOG_INFO("%s Started module \"%s\"", __func__, module->name);

  log::info("Started module \"{}\"", module->name);



  set_module_state(module, MODULE_STATE_STARTED);

  return true;
@@ -100,12 +102,12 @@ void module_shut_down(const module_t* module) { 
  // Only something to do if the module was actually started

  if (state < MODULE_STATE_STARTED) return;



  LOG_INFO("%s Shutting down module \"%s\"", __func__, module->name);

  log::info("Shutting down module \"{}\"", module->name);

  if (!call_lifecycle_function(module->shut_down)) {

    LOG_ERROR("%s Failed to shutdown module \"%s\". Continuing anyway.",

              __func__, module->name);

    log::error("Failed to shutdown module \"{}\". Continuing anyway.",

               module->name);

  }

  LOG_INFO("%s Shutdown of module \"%s\" completed", __func__, module->name);

  log::info("Shutdown of module \"{}\" completed", module->name);



  set_module_state(module, MODULE_STATE_INITIALIZED);

}
@@ -118,12 +120,12 @@ void module_clean_up(const module_t* module) { 
  // Only something to do if the module was actually initialized

  if (state < MODULE_STATE_INITIALIZED) return;



  LOG_INFO("%s Cleaning up module \"%s\"", __func__, module->name);

  log::info("Cleaning up module \"{}\"", module->name);

  if (!call_lifecycle_function(module->clean_up)) {

    LOG_ERROR("%s Failed to cleanup module \"%s\". Continuing anyway.",

              __func__, module->name);

    log::error("Failed to cleanup module \"{}\". Continuing anyway.",

               module->name);

  }

  LOG_INFO("%s Cleanup of module \"%s\" completed", __func__, module->name);

  log::info("Cleanup of module \"{}\" completed", module->name);



  set_module_state(module, MODULE_STATE_NONE);

}

system/btif/co/bta_av_co.cc

+255 −285

File changed.

Preview size limit exceeded, changes collapsed.

system/btif/co/bta_hh_co.cc

+93 −96

File changed.

Preview size limit exceeded, changes collapsed.

system/btif/co/bta_pan_co.cc

+19 −19
Original line number Diff line number Diff line
@@ -31,19 +31,21 @@ 
#include <hardware/bt_pan.h>

#include <string.h>



#include "os/log.h"

#include "bta_api.h"

#include "bta_pan_api.h"

#include "bta_pan_ci.h"

#include "btif_pan_internal.h"

#include "btif_sock_thread.h"

#include "btif_util.h"

#include "os/log.h"

#include "osi/include/allocator.h"

#include "osi/include/osi.h"

#include "pan_api.h"

#include "stack/include/bt_hdr.h"

#include "types/raw_address.h"



using namespace bluetooth;



/*******************************************************************************

 *

 * Function         bta_pan_co_init
@@ -55,7 +57,7 @@ 
 *

 ******************************************************************************/

uint8_t bta_pan_co_init(uint8_t* q_level) {

  LOG_VERBOSE("bta_pan_co_init");

  log::verbose("bta_pan_co_init");



  /* set the q_level to 30 buffers */

  *q_level = 30;
@@ -76,10 +78,10 @@ uint8_t bta_pan_co_init(uint8_t* q_level) { 
 *

 ******************************************************************************/

void bta_pan_co_close(uint16_t handle, uint8_t app_id) {

  LOG_VERBOSE("bta_pan_co_close:app_id:%d, handle:%d", app_id, handle);

  log::verbose("bta_pan_co_close:app_id:{}, handle:{}", app_id, handle);

  btpan_conn_t* conn = btpan_find_conn_handle(handle);

  if (conn && conn->state == PAN_STATE_OPEN) {

    LOG_VERBOSE("bta_pan_co_close");

    log::verbose("bta_pan_co_close");



    // let bta close event reset this handle as it needs

    // the handle to find the connection upon CLOSE
@@ -119,14 +121,14 @@ void bta_pan_co_tx_path(uint16_t handle, uint8_t app_id) { 
  bool ext;

  bool forward;



  LOG_VERBOSE("%s, handle:%d, app_id:%d", __func__, handle, app_id);

  log::verbose("handle:{}, app_id:{}", handle, app_id);



  btpan_conn_t* conn = btpan_find_conn_handle(handle);

  if (!conn) {

    LOG_ERROR("%s: cannot find pan connection", __func__);

    log::error("cannot find pan connection");

    return;

  } else if (conn->state != PAN_STATE_OPEN) {

    LOG_ERROR("%s: conn is not opened, conn:%p, conn->state:%d", __func__, conn,

    log::error("conn is not opened, conn:{}, conn->state:{}", fmt::ptr(conn),

               conn->state);

    return;

  }
@@ -135,14 +137,12 @@ void bta_pan_co_tx_path(uint16_t handle, uint8_t app_id) { 
    /* read next data buffer from pan */

    p_buf = bta_pan_ci_readbuf(handle, src, dst, &protocol, &ext, &forward);

    if (p_buf) {

      LOG_VERBOSE(

          "%s, calling btapp_tap_send, "

          "p_buf->len:%d, offset:%d",

          __func__, p_buf->len, p_buf->offset);

      log::verbose("calling btapp_tap_send, p_buf->len:{}, offset:{}",

                   p_buf->len, p_buf->offset);

      if (is_empty_eth_addr(conn->eth_addr) && is_valid_bt_eth_addr(src)) {

        VLOG(1) << __func__ << " pan bt peer addr: "

                << ADDRESS_TO_LOGGABLE_STR(conn->peer)

                << " update its ethernet addr: " << src;

        log::verbose("pan bt peer addr: {} update its ethernet addr: {}",

                     ADDRESS_TO_LOGGABLE_STR(conn->peer),

                     ADDRESS_TO_LOGGABLE_STR(src));

        conn->eth_addr = src;

      }

      btpan_tap_send(btpan_cb.tap_fd, src, dst, protocol,
@@ -168,7 +168,7 @@ void bta_pan_co_tx_path(uint16_t handle, uint8_t app_id) { 
 ******************************************************************************/

void bta_pan_co_rx_path(UNUSED_ATTR uint16_t handle,

                        UNUSED_ATTR uint8_t app_id) {

  LOG_VERBOSE("bta_pan_co_rx_path not used");

  log::verbose("bta_pan_co_rx_path not used");

}



/*******************************************************************************
@@ -187,7 +187,7 @@ void bta_pan_co_rx_path(UNUSED_ATTR uint16_t handle, 
 ******************************************************************************/

void bta_pan_co_rx_flow(UNUSED_ATTR uint16_t handle, UNUSED_ATTR uint8_t app_id,

                        UNUSED_ATTR bool enable) {

  LOG_VERBOSE("bta_pan_co_rx_flow, enabled:%d, not used", enable);

  log::verbose("bta_pan_co_rx_flow, enabled:{}, not used", enable);

  btpan_conn_t* conn = btpan_find_conn_handle(handle);

  if (!conn || conn->state != PAN_STATE_OPEN) return;

  btpan_set_flow_control(enable);
@@ -207,7 +207,7 @@ void bta_pan_co_pfilt_ind(UNUSED_ATTR uint16_t handle, 
                          UNUSED_ATTR tBTA_PAN_STATUS result,

                          UNUSED_ATTR uint16_t len,

                          UNUSED_ATTR uint8_t* p_filters) {

  LOG_VERBOSE("bta_pan_co_pfilt_ind");

  log::verbose("bta_pan_co_pfilt_ind");

}



/*******************************************************************************
@@ -224,5 +224,5 @@ void bta_pan_co_mfilt_ind(UNUSED_ATTR uint16_t handle, 
                          UNUSED_ATTR tBTA_PAN_STATUS result,

                          UNUSED_ATTR uint16_t len,

                          UNUSED_ATTR uint8_t* p_filters) {

  LOG_VERBOSE("bta_pan_co_mfilt_ind");

  log::verbose("bta_pan_co_mfilt_ind");

}