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

Commit 75005dc7 authored by Hui Peng's avatar Hui Peng Committed by Automerger Merge Worker
Browse files

Merge "Fix a type confusion bug in in bta_av_sink_media_callback" am:... 

Merge "Fix a type confusion bug in in bta_av_sink_media_callback" am: 06656412 am: 8521c950 am: 70176fd4 am: 3d0812ce

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



Change-Id: I8f4bdb721c2b1ae170e5f9d7c6f7ecef2b1177d4
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 75d618d9 3d0812ce

system/btif/src/btif_av.cc

+3 −2
Original line number Diff line number Diff line
@@ -2910,8 +2910,6 @@ static void bta_av_sink_media_callback(const RawAddress& peer_address, 
                                       tBTA_AV_EVT event,

                                       tBTA_AV_MEDIA* p_data) {

  BTIF_TRACE_EVENT("%s: event=%d", __func__, event);

  BTIF_TRACE_EVENT("%s: address=%s", __func__,

                   ADDRESS_TO_LOGGABLE_CSTR(p_data->avk_config.bd_addr));



  switch (event) {

    case BTA_AV_SINK_MEDIA_DATA_EVT: {
@@ -2929,6 +2927,9 @@ static void bta_av_sink_media_callback(const RawAddress& peer_address, 
    case BTA_AV_SINK_MEDIA_CFG_EVT: {

      btif_av_sink_config_req_t config_req;



      BTIF_TRACE_EVENT("%s: address=%s", __func__,

                       ADDRESS_TO_LOGGABLE_CSTR(p_data->avk_config.bd_addr));



      // Update the codec info of the A2DP Sink decoder

      btif_a2dp_sink_update_decoder((uint8_t*)(p_data->avk_config.codec_info));