commit a430f5183c9836302f19d793a13e3670b21cc489
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Fri Aug 13 19:40:13 2021 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Fri Aug 13 19:40:13 2021 +0000
tree 8111758a53d06cb0c092407983086aae9c19544d
parent c8c28c03f5f8f71b8a27512d8b3736919dd486e9
parent 33797a62f23978acd973f0f3cdf9ca7cdf4ca493

Merge cherrypicks of [15560884, 15560845, 15560903, 15560904, 15560905, 15560906, 15560769, 15560755, 15557357, 15557358] into sc-release

Change-Id: I428e447350b128585f51711697844f38f281c884

audio_hal_interface/a2dp_encoding.cc

diff --git a/audio_hal_interface/a2dp_encoding.cc b/audio_hal_interface/a2dp_encoding.cc
index ca07cc4..44a4828 100644
--- a/audio_hal_interface/a2dp_encoding.cc
+++ b/audio_hal_interface/a2dp_encoding.cc
@@ -475,6 +475,8 @@
   }
   active_hal_interface->EndSession();
   static_cast<A2dpTransport*>(active_hal_interface->GetTransportInstance())
+      ->ResetPendingCmd();
+  static_cast<A2dpTransport*>(active_hal_interface->GetTransportInstance())
       ->ResetPresentationPosition();
 }
 

stack/btm/btm_inq.cc

diff --git a/stack/btm/btm_inq.cc b/stack/btm/btm_inq.cc
index 8bb416b..890cd3a 100644
--- a/stack/btm/btm_inq.cc
+++ b/stack/btm/btm_inq.cc
@@ -534,8 +534,10 @@
 
   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);