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

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

Merge changes Idef1560b,I40243c0f,I5c466874,Ie4d1438c,I38a17794, ... am: 98e7952d am: e4eee6c6 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id738c0ff3fc8888a86d6d85c215ded2ac0d21b3d
parents bef5a480 e4eee6c6

system/bta/ag/bta_ag_cmd.cc

+1 −1
Original line number Diff line number Diff line
@@ -1448,7 +1448,7 @@ static void bta_ag_hsp_result(tBTA_AG_SCB* p_scb, 
 ******************************************************************************/

static void bta_ag_hfp_result(tBTA_AG_SCB* p_scb,

                              const tBTA_AG_API_RESULT& result) {

  APPL_TRACE_DEBUG("bta_ag_hfp_result : res = %d", result.result);

  LOG_DEBUG("HFP connection result:%s", result.ToString().c_str());



  switch (result.result) {

    case BTA_AG_SPK_RES:

system/bta/ag/bta_ag_main.cc

+2 −0
Original line number Diff line number Diff line
@@ -503,6 +503,8 @@ void bta_ag_api_register(tBTA_SERVICE_MASK services, tBTA_AG_FEAT features, 
 ******************************************************************************/

void bta_ag_api_result(uint16_t handle, tBTA_AG_RES result,

                       const tBTA_AG_RES_DATA& result_data) {

  LOG_DEBUG("Handle AG API result handle:0x%04x", handle);



  tBTA_AG_DATA event_data = {};

  event_data.api_result.result = result;

  event_data.api_result.data = result_data;

system/bta/ag/bta_ag_sco.cc

+3 −3
Original line number Diff line number Diff line
@@ -246,8 +246,8 @@ static bool bta_ag_remove_sco(tBTA_AG_SCB* p_scb, bool only_active) { 
  if (p_scb->sco_idx != BTM_INVALID_SCO_INDEX) {

    if (!only_active || p_scb->sco_idx == bta_ag_cb.sco.cur_idx) {

      tBTM_STATUS status = BTM_RemoveSco(p_scb->sco_idx);

      APPL_TRACE_DEBUG("%s: SCO index 0x%04x, status %d", __func__,

                       p_scb->sco_idx, status);

      LOG_DEBUG("Removed SCO index:0x%04x status:%s", p_scb->sco_idx,

                btm_status_text(status).c_str());

      if (status == BTM_CMD_STARTED) {

        /* SCO is connected; set current control block */

        bta_ag_cb.sco.p_curr_scb = p_scb;
@@ -338,7 +338,7 @@ static void bta_ag_esco_connreq_cback(tBTM_ESCO_EVT event, 
 * Returns          void

 *

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

static void bta_ag_cback_sco(tBTA_AG_SCB* p_scb, uint8_t event) {

static void bta_ag_cback_sco(tBTA_AG_SCB* p_scb, tBTA_AG_EVT event) {

  tBTA_AG_HDR sco = {};

  sco.handle = bta_ag_scb_to_idx(p_scb);

  sco.app_id = p_scb->app_id;

system/bta/gatt/bta_gattc_cache.cc

+0 −1
Original line number Diff line number Diff line
@@ -37,7 +37,6 @@ 
#include "bta_gattc_int.h"

#include "btm_api.h"

#include "btm_ble_api.h"

#include "btm_int.h"

#include "database.h"

#include "database_builder.h"

#include "osi/include/log.h"

system/btif/src/btif_dm.cc

+0 −1
Original line number Diff line number Diff line
@@ -72,7 +72,6 @@ 
#include "osi/include/osi.h"

#include "osi/include/properties.h"

#include "stack/btm/btm_dev.h"

#include "stack/btm/btm_int.h"

#include "stack/btm/btm_sec.h"

#include "stack_config.h"