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

Commit 67c8c92f authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 6013487 from 4bbaa60d to rvc-release 

Change-Id: I4ec097a46ecaee6700a3e95f7512ec1ee705055e
parents fcea7990 4bbaa60d

system/bta/dm/bta_dm_act.cc

+7 −5
Original line number Diff line number Diff line
@@ -42,6 +42,7 @@ 
#include "btm_api.h"

#include "btm_int.h"

#include "btu.h"

#include "device/include/interop.h"

#include "gap_api.h" /* For GAP_BleReadPeerPrefConnParams */

#include "l2c_api.h"

#include "osi/include/log.h"
@@ -50,7 +51,6 @@ 
#include "stack/gatt/connection_manager.h"

#include "stack/include/gatt_api.h"

#include "utl.h"

#include "device/include/interop.h"



#if (GAP_INCLUDED == TRUE)

#include "gap_api.h"
@@ -1357,8 +1357,10 @@ void bta_dm_sdp_result(tBTA_DM_MSG* p_data) { 
    do {

      p_sdp_rec = NULL;

      if (bta_dm_search_cb.service_index == (BTA_USER_SERVICE_ID + 1)) {

        if (!bta_dm_search_cb.uuid.IsEmpty()) {

          p_sdp_rec = SDP_FindServiceUUIDInDb(bta_dm_search_cb.p_sdp_db,

                                              bta_dm_search_cb.uuid, p_sdp_rec);

        }



        if (p_sdp_rec && SDP_FindProtocolListElemInRec(

                             p_sdp_rec, UUID_PROTOCOL_RFCOMM, &pe)) {
@@ -1772,7 +1774,6 @@ void bta_dm_search_cancel_notify(UNUSED_ATTR tBTA_DM_MSG* p_data) { 
 *

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

static void bta_dm_find_services(const RawAddress& bd_addr) {



  while (bta_dm_search_cb.service_index < BTA_MAX_SERVICE_ID) {

    Uuid uuid = Uuid::kEmpty;

    if (bta_dm_search_cb.services_to_search &
@@ -1951,7 +1952,8 @@ static void bta_dm_discover_device(const RawAddress& remote_bd_addr) { 
        BT_DEVICE_TYPE_BLE) &&

       (bta_dm_search_cb.state == BTA_DM_SEARCH_ACTIVE)) ||

      (transport == BT_TRANSPORT_LE &&

       interop_match_addr(INTEROP_DISABLE_NAME_REQUEST, &bta_dm_search_cb.peer_bdaddr))) {

       interop_match_addr(INTEROP_DISABLE_NAME_REQUEST,

                          &bta_dm_search_cb.peer_bdaddr))) {

    /* Do not perform RNR for LE devices at inquiry complete*/

    bta_dm_search_cb.name_discover_done = true;

  }

system/btif/src/btif_dm.cc

+0 −1
Original line number Diff line number Diff line
@@ -1108,7 +1108,6 @@ static void btif_dm_auth_cmpl_evt(tBTA_DM_AUTH_CMPL* p_auth_cmpl) { 


      LOG_WARN(LOG_TAG, "%s: Incoming HID Connection", __func__);

      bt_property_t prop;

      RawAddress bd_addr;

      Uuid uuid = Uuid::From16Bit(UUID_SERVCLASS_HUMAN_INTERFACE);



      prop.type = BT_PROPERTY_UUIDS;

system/btif/src/btif_rc.cc

+2 −3
Original line number Diff line number Diff line
@@ -3152,11 +3152,10 @@ static void handle_notification_response(tBTA_AV_META_MSG* pmeta_msg, 
          break;

        } else {

          uint8_t* p_data = p_rsp->param.track;

          /* Update the UID for current track

           * Attributes will be fetched after the AVRCP procedure

           */

          BE_STREAM_TO_UINT64(p_dev->rc_playing_uid, p_data);

          get_play_status_cmd(p_dev);

          get_element_attribute_cmd(AVRC_MAX_NUM_MEDIA_ATTR_ID, attr_list,

                                    p_dev);

        }

        break;

system/gd/hci/acl_manager.cc

+2 −2
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ struct AclManager::acl_connection { 
};



struct AclManager::impl {

  impl(AclManager& acl_manager) : acl_manager_(acl_manager) {}

  impl(const AclManager& acl_manager) : acl_manager_(acl_manager) {}



  void Start() {

    hci_layer_ = acl_manager_.GetDependency<HciLayer>();
@@ -1580,7 +1580,7 @@ struct AclManager::impl { 
    handler_->Post(BindOnce(&impl::cleanup, common::Unretained(this), handle));

  }



  AclManager& acl_manager_;

  const AclManager& acl_manager_;



  Controller* controller_ = nullptr;

  uint16_t max_acl_packet_credits_ = 0;

system/gd/hci/acl_manager.h

+3 −3
Original line number Diff line number Diff line
@@ -150,11 +150,11 @@ class AclConnection { 


 private:

  friend AclManager;

  AclConnection(AclManager* manager, uint16_t handle, Address address)

  AclConnection(const AclManager* manager, uint16_t handle, Address address)

      : manager_(manager), handle_(handle), address_(address) {}

  AclConnection(AclManager* manager, uint16_t handle, Address address, AddressType address_type, Role role)

  AclConnection(const AclManager* manager, uint16_t handle, Address address, AddressType address_type, Role role)

      : manager_(manager), handle_(handle), address_(address), address_type_(address_type), role_(role) {}

  AclManager* manager_;

  const AclManager* manager_;

  uint16_t handle_;

  Address address_;

  AddressType address_type_;