aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--audio_hal_interface/a2dp_encoding.cc2
-rw-r--r--stack/btm/btm_inq.cc4
2 files changed, 5 insertions, 1 deletions
diff --git a/audio_hal_interface/a2dp_encoding.cc b/audio_hal_interface/a2dp_encoding.cc
index ca07cc451..44a4828fc 100644
--- a/audio_hal_interface/a2dp_encoding.cc
+++ b/audio_hal_interface/a2dp_encoding.cc
@@ -475,6 +475,8 @@ void end_session() {
}
active_hal_interface->EndSession();
static_cast<A2dpTransport*>(active_hal_interface->GetTransportInstance())
+ ->ResetPendingCmd();
+ static_cast<A2dpTransport*>(active_hal_interface->GetTransportInstance())
->ResetPresentationPosition();
}
diff --git a/stack/btm/btm_inq.cc b/stack/btm/btm_inq.cc
index 8bb416b7b..890cd3a0d 100644
--- a/stack/btm/btm_inq.cc
+++ b/stack/btm/btm_inq.cc
@@ -534,8 +534,10 @@ tBTM_STATUS BTM_StartInquiry(tBTM_INQ_RESULTS_CB* p_results_cb,
if (controller_get_interface()->supports_ble()) {
btm_ble_start_inquiry(p_inq->inqparms.duration);
+ } else {
+ LOG_WARN("Trying to do LE scan on a non-LE adapter");
+ p_inq->inqparms.mode &= ~BTM_BLE_INQUIRY_MASK;
}
- p_inq->inqparms.mode &= ~BTM_BLE_INQUIRY_MASK;
btm_acl_update_inquiry_status(BTM_INQUIRY_STARTED);