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

Commit 7105ba09 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Add SDP record for UUID_SERVCLASS_AV_REMOTE_CONTROL when AVRCP startup"

parents 73c62fd5 1de3533b

system/btif/avrcp/avrcp_service.cc

+10 −0
Original line number Diff line number Diff line
@@ -302,6 +302,13 @@ void AvrcpService::Init(MediaInterface* media_interface, 
                             profile_version, 0);

  bta_sys_add_uuid(UUID_SERVCLASS_AV_REM_CTRL_TARGET);



  ct_sdp_record_handle = SDP_CreateRecord();



  avrcp_interface_.AddRecord(UUID_SERVCLASS_AV_REMOTE_CONTROL,

                             "AV Remote Control", NULL, AVRCP_SUPF_TG_CT,

                             ct_sdp_record_handle, false, AVRC_REV_1_3, 0);

  bta_sys_add_uuid(UUID_SERVCLASS_AV_REMOTE_CONTROL);



  media_interface_ = new MediaInterfaceWrapper(media_interface);

  media_interface->RegisterUpdateCallback(instance_);
@@ -338,6 +345,9 @@ void AvrcpService::Cleanup() { 
  avrcp_interface_.RemoveRecord(sdp_record_handle);

  bta_sys_remove_uuid(UUID_SERVCLASS_AV_REM_CTRL_TARGET);

  sdp_record_handle = -1;

  avrcp_interface_.RemoveRecord(ct_sdp_record_handle);

  bta_sys_remove_uuid(UUID_SERVCLASS_AV_REMOTE_CONTROL);

  ct_sdp_record_handle = -1;



  connection_handler_->CleanUp();

  connection_handler_ = nullptr;

system/btif/avrcp/avrcp_service.h

+1 −0
Original line number Diff line number Diff line
@@ -98,6 +98,7 @@ class AvrcpService : public MediaCallbacks { 
  static ServiceInterfaceImpl* service_interface_;



  uint32_t sdp_record_handle = -1;

  uint32_t ct_sdp_record_handle = -1;

  uint16_t profile_version = -1;



  MediaInterface* media_interface_ = nullptr;

system/profile/avrcp/avrcp_config.h

+7 −0
Original line number Diff line number Diff line
@@ -50,3 +50,10 @@ 
#ifndef AVRCP_SUPF_TG

#define AVRCP_SUPF_TG_DEFAULT AVRCP_SUPF_TG_1_4

#endif



/**

 * Supported Feature for AVRCP tartget control

 */

#ifndef AVRCP_SUPF_TG_CT

#define AVRCP_SUPF_TG_CT AVRC_SUPF_CT_CAT2

#endif