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

Commit 4407ac75 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge changes Iefb88b7e,Ia8fd678c,Ieefd35fa,Ib474f0be,I16606384, ... 

* changes:
  Re-log btif/src/btif_dm::btif_dm_cancel_discovery
  Re-log btif/src/btif_dm::btif_dm_search_services_evt
  Re-log btif/src/btif_dm::btif_update_remote_properties
  Re-log btif/src/btif_dm::bond_state_changed
  Re-log btif/src/btif_core::btif_enable_bluetooth_evt
  Re-log btif_get____type
  Log proper btif/src/btif_bqr::ConfigureBqr
  Re-log btif/src/btif_av::btif_av_get_peer_sep
  Re-log btif/src/btif_a2dp::btif_a2dp_on_idle
  Restore Le transport for SetPhy function
parents 7bb58c96 a4f86fe1

system/btif/src/btif_a2dp.cc

+2 −2
Original line number Diff line number Diff line
@@ -37,8 +37,8 @@ 
#include "osi/include/log.h"



void btif_a2dp_on_idle(void) {

  LOG_INFO("%s: ## ON A2DP IDLE ## peer_sep = %d", __func__,

           btif_av_get_peer_sep());

  LOG_VERBOSE("Peer stream endpoint type:%s",

              peer_stream_endpoint_text(btif_av_get_peer_sep()).c_str());

  if (btif_av_get_peer_sep() == AVDT_TSEP_SNK) {

    btif_a2dp_source_on_idle();

  } else if (btif_av_get_peer_sep() == AVDT_TSEP_SRC) {

system/btif/src/btif_av.cc

+3 −4
Original line number Diff line number Diff line
@@ -3229,13 +3229,12 @@ bool btif_av_is_connected(void) { 
uint8_t btif_av_get_peer_sep(void) {

  BtifAvPeer* peer = btif_av_find_active_peer();

  if (peer == nullptr) {

    BTIF_TRACE_WARNING("%s: No active peer found", __func__);

    LOG_DEBUG("No active sink or source peer found");

    return AVDT_TSEP_SNK;

  }



  uint8_t peer_sep = peer->PeerSep();

  BTIF_TRACE_DEBUG("%s: Peer %s SEP is %s (%d)", __func__,

                   peer->PeerAddress().ToString().c_str(),

  LOG_DEBUG("Peer %s SEP is %s (%d)", peer->PeerAddress().ToString().c_str(),

            (peer_sep == AVDT_TSEP_SRC) ? "Source" : "Sink", peer_sep);

  return peer_sep;

}

system/btif/src/btif_bqr.cc

+2 −1
Original line number Diff line number Diff line
@@ -266,7 +266,8 @@ void ConfigureBqr(const BqrConfiguration& bqr_config) { 
    return;

  }



  LOG(INFO) << __func__ << ": Action: " << bqr_config.report_action

  LOG(INFO) << __func__ << ": Action: "

            << loghex(static_cast<uint8_t>(bqr_config.report_action))

            << ", Mask: " << loghex(bqr_config.quality_event_mask)

            << ", Interval: " << bqr_config.minimum_report_interval_ms;

system/btif/src/btif_config.cc

+2 −4
Original line number Diff line number Diff line
@@ -136,8 +136,7 @@ bool btif_get_device_type(const RawAddress& bda, int* p_device_type) { 


  if (!btif_config_get_int(bd_addr_str, "DevType", p_device_type)) return false;



  LOG_DEBUG("%s: Device [%s] device type %d", __func__, bd_addr_str,

            *p_device_type);

  LOG_DEBUG("Device [%s] device type %d", bd_addr_str, *p_device_type);

  return true;

}
@@ -151,8 +150,7 @@ bool btif_get_address_type(const RawAddress& bda, tBLE_ADDR_TYPE* p_addr_type) { 
  if (!btif_config_get_int(bd_addr_str, "AddrType", &val)) return false;

  *p_addr_type = static_cast<tBLE_ADDR_TYPE>(val);



  LOG_DEBUG("%s: Device [%s] address type %d", __func__, bd_addr_str,

            *p_addr_type);

  LOG_DEBUG("Device [%s] address type %d", bd_addr_str, *p_addr_type);

  return true;

}

system/btif/src/btif_core.cc

+2 −3
Original line number Diff line number Diff line
@@ -263,8 +263,7 @@ void btif_enable_bluetooth_evt() { 
  int val_size = 0;

  if ((btif_config_get_str("Adapter", "Address", val, &val_size) == 0) ||

      strcmp(bdstr.c_str(), val) == 0) {

    // This address is not present in the config file, save it there.

    BTIF_TRACE_WARNING("%s: Saving the Adapter Address", __func__);

    LOG_DEBUG("Storing the adapter address into the config file");

    btif_config_set_str("Adapter", "Address", bdstr.c_str());

    btif_config_save();
@@ -295,7 +294,7 @@ void btif_enable_bluetooth_evt() { 
#endif



  future_ready(stack_manager_get_hack_future(), FUTURE_SUCCESS);

  LOG_INFO("%s finished", __func__);

  LOG_INFO("Bluetooth enable event completed");

}



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