Merge branch 'bugfix/fix_some_bt_bugs' into 'master'

fix(bt): fix some bluetooth bugs

Closes IDFGH-16334 and IDFGH-15166

See merge request espressif/esp-idf!42261

Author: wmy-espressif

components/bt/controller/esp32/bt.c

@@ -1972,6 +1972,7 @@ esp_err_t esp_bt_controller_disable(void)
 #endif
 
     esp_phy_disable(PHY_MODEM_BT);
+    s_time_phy_rf_just_enabled = 0;
     btdm_controller_status = ESP_BT_CONTROLLER_STATUS_INITED;
     esp_unregister_shutdown_handler(bt_shutdown);
 

components/bt/host/bluedroid/bta/hf_ag/bta_ag_sco.c

@@ -345,10 +345,8 @@ static void bta_ag_sco_read_cback(UINT16 sco_inx, BT_HDR *p_data, tBTM_SCO_DATA_
         APPL_TRACE_DEBUG("bta_ag_sco_read_cback: status(%d)", status);
     }
 
-#if (BTA_HFP_EXT_CODEC == FALSE)
     /* Callout function must free the data. */
     bta_ag_sco_co_in_data(p_data, status);
-#endif
 }
 #endif
 /*******************************************************************************

components/bt/host/bluedroid/btc/profile/std/hf_ag/bta_ag_co.c

@@ -567,6 +567,8 @@ uint32_t bta_ag_sco_co_out_data(UINT8 *p_buf)
     return 0;
 }
 
+#endif
+
 /*******************************************************************************
 **
 ** Function         bta_ag_sco_co_in_data
@@ -618,7 +620,6 @@ void bta_ag_sco_co_in_data(BT_HDR *p_buf, tBTM_SCO_DATA_FLAG status)
                 }
                 btc_hf_audio_data_cb_to_app((uint8_t *)p_new_buf, (uint8_t *)p_data, BTM_MSBC_FRAME_SIZE, bta_ag_co_cb.is_bad_frame);
                 bta_ag_co_cb.is_bad_frame = false;
-                memset(bta_ag_co_cb.decode_msbc_data, 0, BTM_MSBC_FRAME_SIZE);
             }
             bta_ag_co_cb.rx_first_pkt = !bta_ag_co_cb.rx_first_pkt;
         }
@@ -684,7 +685,6 @@ void bta_ag_sco_co_in_data(BT_HDR *p_buf, tBTM_SCO_DATA_FLAG status)
     osi_free(p_buf);
 #endif
 }
-#endif
 
 #endif /* #if (BTM_SCO_HCI_INCLUDED == TRUE) */
 #endif /* #if (BTA_AG_INCLUDED == TRUE) */