From cfce9e1c7274c6cdda984aabe17cf5239b07d22b Mon Sep 17 00:00:00 2001 From: Jiang Jiang Jian Date: Tue, 20 Mar 2018 18:24:01 +0800 Subject: [PATCH] Merge branch 'bugfix/btdm_avrc_remote_bda_error_when_disconnect' into 'master' component/bt: Fix bug: AVRC remote_bda error when disconnect See merge request idf/esp-idf!2093 (cherry picked from commit 8ab17d7ccf0cf4ca299177b73d9c5f6b51c0a49a) 2531975c component/bt: Fix bug: AVRC remote_bda error when disconnect --- components/bt/bluedroid/btc/profile/std/avrc/btc_avrc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/components/bt/bluedroid/btc/profile/std/avrc/btc_avrc.c b/components/bt/bluedroid/btc/profile/std/avrc/btc_avrc.c index cb884e270..eb6be23de 100644 --- a/components/bt/bluedroid/btc/profile/std/avrc/btc_avrc.c +++ b/components/bt/bluedroid/btc/profile/std/avrc/btc_avrc.c @@ -168,7 +168,7 @@ static void handle_rc_connect (tBTA_AV_RC_OPEN *p_rc_open) param.conn_stat.connected = true; memcpy(param.conn_stat.remote_bda, &rc_addr, sizeof(esp_bd_addr_t)); btc_avrc_ct_cb_to_app(ESP_AVRC_CT_CONNECTION_STATE_EVT, ¶m); - + /* on locally initiated connection we will get remote features as part of connect */ if (p_rc_open->sdp_disc_done == TRUE) { handle_rc_features(); @@ -201,7 +201,7 @@ static void handle_rc_disconnect (tBTA_AV_RC_CLOSE *p_rc_close) btc_rc_vb.rc_handle = 0; btc_rc_vb.rc_connected = FALSE; - memset(btc_rc_vb.rc_addr, 0, sizeof(BD_ADDR)); + memcpy(btc_rc_vb.rc_addr, p_rc_close->peer_addr, sizeof(BD_ADDR)); memset(btc_rc_vb.rc_notif, 0, sizeof(btc_rc_vb.rc_notif)); btc_rc_vb.rc_features = 0;