commit 82763b80e84f41f9db7da791815b0207e0e28e40
author Ted Wang <tedwang@google.com> Mon Nov 25 19:50:39 2019 -0800
committer android-build-merger <android-build-merger@google.com> Mon Nov 25 19:50:39 2019 -0800
tree 1b3059504976783c6101315c646170ce90a481ab
parent 9e976434fe9b8b9ca42371b0ba865d4c69c9137f
parent 373dd096ba9ca166ba495f4fc2f4f49961a1c33b

Merge "Revert "Fix potential OOB write in btm_read_remote_ext_features_complete"" into pi-dev am: 9f4246c83b
am: 373dd096ba

Change-Id: Ie96b7d9290233712edb3c21a6e9fa05d56954b7e

bta/av/bta_av_main.cc

diff --git a/bta/av/bta_av_main.cc b/bta/av/bta_av_main.cc
index 34516fc..bdd8a70 100644
--- a/bta/av/bta_av_main.cc
+++ b/bta/av/bta_av_main.cc
@@ -1108,8 +1108,10 @@
                   "%s: peer %s BTM_SwitchRole(BTM_ROLE_MASTER) error: %d",
                   __func__, p_scb->PeerAddress().ToString().c_str(), status);
       }
-      is_ok = false;
-      p_scb->wait |= BTA_AV_WAIT_ROLE_SW_RES_START;
+      if (status != BTM_DEV_BLACKLISTED) {
+        is_ok = false;
+        p_scb->wait |= BTA_AV_WAIT_ROLE_SW_RES_START;
+      }
     }
   }
 

bta/hearing_aid/hearing_aid.cc

diff --git a/bta/hearing_aid/hearing_aid.cc b/bta/hearing_aid/hearing_aid.cc
index fb7cab7..465e45e 100644
--- a/bta/hearing_aid/hearing_aid.cc
+++ b/bta/hearing_aid/hearing_aid.cc
@@ -390,6 +390,13 @@
       hearingDevice->connection_update_status = AWAITING;
     }
 
+    tACL_CONN* p_acl = btm_bda_to_acl(address, BT_TRANSPORT_LE);
+    if (p_acl != nullptr && controller_get_interface()->supports_ble_2m_phy() &&
+        HCI_LE_2M_PHY_SUPPORTED(p_acl->peer_le_features)) {
+      LOG(INFO) << address << " set preferred PHY to 2M";
+      BTM_BleSetPhy(address, PHY_LE_2M, PHY_LE_2M, 0);
+    }
+
     // Set data length
     // TODO(jpawlowski: for 16khz only 87 is required, optimize
     BTM_SetBleDataLength(address, 167);