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

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

Snap for 5073521 from 7507a019 to pi-qpr2-release 

Change-Id: I7ff65fecfc44c41f7a581920f53497bfd705f7a1
parents e21b7020 7507a019

system/audio_a2dp_hw/src/audio_a2dp_hw.cc

+2 −0
Original line number Diff line number Diff line
@@ -1680,6 +1680,8 @@ static void adev_close_output_stream(struct audio_hw_device* dev, 
  struct a2dp_audio_device* a2dp_dev = (struct a2dp_audio_device*)dev;

  struct a2dp_stream_out* out = (struct a2dp_stream_out*)stream;



  INFO("%s: state %d", __func__, out->common.state);



  // prevent interference with adev_set_parameters.

  std::lock_guard<std::recursive_mutex> lock(*a2dp_dev->mutex);

  {

system/bta/hearing_aid/hearing_aid.cc

+4 −1
Original line number Diff line number Diff line
@@ -704,8 +704,11 @@ class HearingAidImpl : public HearingAid { 
  void ConnectSocket(HearingDevice* hearingDevice) {

    tL2CAP_CFG_INFO cfg_info = tL2CAP_CFG_INFO{.mtu = 512};



    uint8_t service_id = hearingDevice->isLeft()

                             ? BTM_SEC_SERVICE_HEARING_AID_LEFT

                             : BTM_SEC_SERVICE_HEARING_AID_RIGHT;

    uint16_t gap_handle = GAP_ConnOpen(

        "", 0, false, &hearingDevice->address, hearingDevice->psm,

        "", service_id, false, &hearingDevice->address, hearingDevice->psm,

        514 /* MPS */, &cfg_info, nullptr,

        BTM_SEC_NONE /* TODO: request security ? */, L2CAP_FCR_LE_COC_MODE,

        HearingAidImpl::GapCallbackStatic, BT_TRANSPORT_LE);

system/bta/hearing_aid/hearing_aid_audio_source.cc

+4 −3
Original line number Diff line number Diff line
@@ -129,7 +129,7 @@ void hearing_aid_recv_ctrl_data() { 
    return;

  }



  VLOG(2) << __func__ << " " << audio_ha_hw_dump_ctrl_event(cmd);

  LOG(INFO) << __func__ << " " << audio_ha_hw_dump_ctrl_event(cmd);

  //  a2dp_cmd_pending = cmd;



  switch (cmd) {
@@ -245,7 +245,8 @@ void hearing_aid_recv_ctrl_data() { 
      hearing_aid_send_ack(HEARING_AID_CTRL_ACK_FAILURE);

      break;

  }

  VLOG(2) << __func__ << " a2dp-ctrl-cmd : " << audio_ha_hw_dump_ctrl_event(cmd)

  LOG(INFO) << __func__

            << " a2dp-ctrl-cmd : " << audio_ha_hw_dump_ctrl_event(cmd)

            << " DONE";

}

system/stack/include/btm_api_types.h

+3 −1
Original line number Diff line number Diff line
@@ -1192,9 +1192,11 @@ typedef uint8_t tBTM_LINK_KEY_TYPE; 
#define BTM_SEC_SERVICE_HIDD_SEC_CTRL 51

#define BTM_SEC_SERVICE_HIDD_NOSEC_CTRL 52

#define BTM_SEC_SERVICE_HIDD_INTR 53

#define BTM_SEC_SERVICE_HEARING_AID_LEFT 54

#define BTM_SEC_SERVICE_HEARING_AID_RIGHT 55



/* Update these as services are added */

#define BTM_SEC_SERVICE_FIRST_EMPTY 54

#define BTM_SEC_SERVICE_FIRST_EMPTY 56



#ifndef BTM_SEC_MAX_SERVICES

#define BTM_SEC_MAX_SERVICES 75