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

Commit 476e9d7a authored by Chris Manton's avatar Chris Manton Committed by Automerger Merge Worker
Browse files

Re-include btif::btif_rc am: b3673f19 am: 0061d05c 

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



Change-Id: Ib872a3581aeced64c7be90e86dbf96f142c88b54
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 8f0a7763 0061d05c

system/btif/src/btif_rc.cc

+14 −5
Original line number Diff line number Diff line
@@ -35,11 +35,11 @@ 
#include <time.h>

#include <unistd.h>



#include <cstdio>

#include <mutex>



#include "avrc_defs.h"

#include "bta_api.h"

#include "bta_av_api.h"

#include "bta/include/bta_api.h"

#include "bta/include/bta_av_api.h"

#include "btif/avrcp/avrcp_service.h"

#include "btif_av.h"

#include "btif_common.h"
@@ -49,9 +49,10 @@ 
#include "osi/include/alarm.h"

#include "osi/include/allocator.h"

#include "osi/include/list.h"

#include "osi/include/osi.h"

#include "osi/include/osi.h"  // UNUSED_ATTR

#include "osi/include/properties.h"

#include "stack/include/avrc_api.h"

#include "stack/include/avrc_defs.h"

#include "stack/include/bt_hdr.h"

#include "types/raw_address.h"
@@ -5745,7 +5746,15 @@ static void browse_cmd_timeout_handler(btif_rc_device_cb_t* p_dev, 
  }



  tAVRC_RESPONSE avrc_response = {0};

  tBTA_AV_META_MSG meta_msg = {.rc_handle = p_dev->rc_handle};

  tBTA_AV_META_MSG meta_msg = {

      .rc_handle = p_dev->rc_handle,

      .len = 0,

      .label = 0,

      .code = 0,

      .company_id = 0,

      .p_data = nullptr,

      .p_msg = nullptr,

  };



  LOG_WARN("%s: timeout, addr=%s, label=%d, pdu_id=%s", __func__,

           ADDRESS_TO_LOGGABLE_CSTR(p_dev->rc_addr), label,