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

Commit 26d8b3f9 authored by Jakub Rotkiewicz's avatar Jakub Rotkiewicz Committed by Automerger Merge Worker
Browse files

Merge "avrcp: Connect AV when peer connected only AVRCP" into main am: 63feef09 am: 5b291182 

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/2932510



Change-Id: I4bf0f706af32279aa33b9f89c1f391c50e0e5895
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 443d86f5 5b291182

system/btif/avrcp/avrcp_service.cc

+45 −0
Original line number Diff line number Diff line
@@ -28,6 +28,8 @@ 
#include "btif_av.h"

#include "btif_common.h"

#include "device.h"

#include "osi/include/osi.h"

#include "stack/include/a2dp_api.h"

#include "stack/include/bt_hdr.h"

#include "stack/include/bt_uuid16.h"

#include "stack/include/main_thread.h"
@@ -53,6 +55,28 @@ class A2dpInterfaceImpl : public A2dpInterface { 
  bool is_peer_in_silence_mode(const RawAddress& peer_address) override {

    return btif_av_is_peer_silenced(peer_address);

  }



  void connect_audio_sink_delayed(uint8_t handle,

                                  const RawAddress& peer_address) override {

    btif_av_connect_sink_delayed(handle, peer_address);

  }



  uint16_t find_audio_sink_service(const RawAddress& peer_address,

                                   tA2DP_FIND_CBACK p_cback) override {

    uint16_t attr_list[] = {ATTR_ID_SERVICE_CLASS_ID_LIST,

                            ATTR_ID_BT_PROFILE_DESC_LIST,

                            ATTR_ID_SUPPORTED_FEATURES};



    tA2DP_SDP_DB_PARAMS db_params = {

        .db_len = BT_DEFAULT_BUFFER_SIZE,

        .num_attr = ARRAY_SIZE(attr_list),

        .p_attrs = attr_list,

    };



    return A2DP_FindService(UUID_SERVCLASS_AUDIO_SINK, peer_address, &db_params,

                            p_cback);

  }



} a2dp_interface_;



class AvrcpInterfaceImpl : public AvrcpInterface {
@@ -638,6 +662,27 @@ bool AvrcpService::ServiceInterfaceImpl::DisconnectDevice( 
  return true;

}



bool AvrcpService::IsDeviceConnected(const RawAddress& bdaddr) {

  if (instance_ == nullptr) {

    log::warn("AVRCP Target Service not started");

    return false;

  }



  auto handler = instance_->connection_handler_;

  if (handler == nullptr) {

    log::warn("AVRCP connection handler is null");

    return false;

  }



  for (const auto& device : handler->GetListOfDevices()) {

    if (bdaddr == device->GetAddress()) {

      return true;

    }

  }



  return false;

}



void AvrcpService::ServiceInterfaceImpl::SetBipClientStatus(

    const RawAddress& bdaddr, bool connected) {

  std::lock_guard<std::mutex> lock(service_interface_lock_);

system/btif/avrcp/avrcp_service.h

+2 −0
Original line number Diff line number Diff line
@@ -76,6 +76,8 @@ class AvrcpService : public MediaCallbacks { 
  void SendPlayerSettingsChanged(std::vector<PlayerAttribute> attributes,

                                 std::vector<uint8_t> values) override;



  bool IsDeviceConnected(const RawAddress& bdaddr);



  /** when a2dp connected, btif will start register vol changed, so we need a

   * interface for it. */

  void RegisterVolChanged(const RawAddress& bdaddr);

system/btif/include/btif_av.h

+8 −0
Original line number Diff line number Diff line
@@ -276,6 +276,14 @@ void btif_av_set_dynamic_audio_buffer_size(uint8_t dynamic_audio_buffer_size); 
 */

void btif_av_set_low_latency(bool is_low_latency);



/**

 * Initiate an AV connection after 3s timeout to peer audio sink

 * @param handle bta handle

 * @param peer_addr peer address

 */

void btif_av_connect_sink_delayed(uint8_t handle,

                                  const RawAddress& peer_address);



/**

 * Check whether A2DP Source is enabled.

 */

system/btif/src/btif_av.cc

+24 −1
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ 
#include <vector>



#include "audio_hal_interface/a2dp_encoding.h"

#include "btif/avrcp/avrcp_service.h"

#include "btif/include/btif_a2dp.h"

#include "btif/include/btif_a2dp_control.h"

#include "btif/include/btif_a2dp_sink.h"
@@ -2895,11 +2896,23 @@ bool BtifAvStateMachine::StateClosing::ProcessEvent(uint32_t event, 
 */

static void btif_av_source_initiate_av_open_timer_timeout(void* data) {

  BtifAvPeer* peer = (BtifAvPeer*)data;

  bool device_connected = false;



  if (IS_FLAG_ENABLED(avrcp_connect_a2dp_delayed) && is_new_avrcp_enabled()) {

    // check if device is connected

    if (bluetooth::avrcp::AvrcpService::Get() != nullptr) {

      device_connected =

          bluetooth::avrcp::AvrcpService::Get()->IsDeviceConnected(

              peer->PeerAddress());

    }

  } else {

    device_connected = btif_rc_is_connected_peer(peer->PeerAddress());

  }



  log::verbose("Peer {}", peer->PeerAddress());



  // Check if AVRCP is connected to the peer

  if (!btif_rc_is_connected_peer(peer->PeerAddress())) {

  if (!device_connected) {

    log::error("AVRCP peer {} is not connected", peer->PeerAddress());

    return;

  }
@@ -4361,3 +4374,13 @@ bool btif_av_peer_is_source(const RawAddress& peer_address) { 


  return true;

}



void btif_av_connect_sink_delayed(uint8_t handle,

                                  const RawAddress& peer_address) {

  log::debug("Peer {} : handle: {}", ADDRESS_TO_LOGGABLE_CSTR(peer_address),

             handle);



  if (btif_av_source.Enabled()) {

    btif_av_source_dispatch_sm_event(peer_address, BTIF_AV_AVRCP_OPEN_EVT);

  }

}

system/profile/avrcp/Android.bp

+3 −0
Original line number Diff line number Diff line
@@ -64,6 +64,9 @@ cc_test { 
        "tests/avrcp_connection_handler_test.cc",

        "tests/avrcp_device_test.cc",

    ],

    shared_libs: [

        "server_configurable_flags",

    ],

    static_libs: [

        "avrcp-target-service",

        "lib-bt-packets",