commit 699ff6adc2f5ae51c15ed6a92f3caa4ff15d8a8c
author David Duarte <licorne@google.com> Mon Nov 27 04:04:54 2023 +0000
committer David Duarte <licorne@google.com> Mon Nov 27 18:51:52 2023 +0000
tree 9471f5ac53bc0171a47429357ea5149cd7b935c7
parent 1d8c9fd524d32b649ca147891591783c353ebf36

hearing_aid: Always update conn params on connect

Connection parameters update does not change the anchor point
so we don't need to update connections parameters on one
connection at a time.

All the usage of connection_update_status will be cleaned in a
follow-up to minimize modifications for this release.

This is done to mitigate a bug on Broadcom controllers where with the
previous behavior the LE Connection Update Complete event was sometime
not sent on the second HA leading to a Disconnection.

Bug: 313466876
Test: manual, on a Pixel 6a and Pixel 7a, stream to a ASHA device
Change-Id: I26337437f3d994c2944981afd27cb1a95943be88

system/bta/hearing_aid/hearing_aid.cc

diff --git a/system/bta/hearing_aid/hearing_aid.cc b/system/bta/hearing_aid/hearing_aid.cc
index fe9c219..b437996 100644
--- a/system/bta/hearing_aid/hearing_aid.cc
+++ b/system/bta/hearing_aid/hearing_aid.cc
@@ -188,14 +188,6 @@
     return (iter == devices.end()) ? nullptr : &(*iter);
   }
 
-  bool IsAnyConnectionUpdateStarted() {
-    for (const auto& d : devices) {
-      if (d.connection_update_status == STARTED) return true;
-    }
-
-    return false;
-  }
-
   void StartRssiLog() {
     int read_rssi_start_interval_count = 0;
 
@@ -514,22 +506,8 @@
       }
     }
 
-    /* We must update connection parameters one at a time, otherwise anchor
-     * point (start of connection event) for two devices can be too close to
-     * each other. Here, by setting min_ce_len=max_ce_len=X, we force controller
-     * to move anchor point of both connections away from each other, to make
-     * sure we'll be able to fit all the data we want in one connection event.
-     */
-    bool any_update_pending = hearingDevices.IsAnyConnectionUpdateStarted();
-    // mark the device as pending connection update. If we don't start the
-    // update now, it'll be started once current device finishes.
-    if (!any_update_pending) {
-      hearingDevice->connection_update_status = STARTED;
-      hearingDevice->requested_connection_interval =
-          UpdateBleConnParams(address);
-    } else {
-      hearingDevice->connection_update_status = AWAITING;
-    }
+    hearingDevice->connection_update_status = STARTED;
+    hearingDevice->requested_connection_interval = UpdateBleConnParams(address);
 
     if (controller_get_interface()->supports_ble_2m_phy()) {
       LOG_INFO("%s set preferred 2M PHY", ADDRESS_TO_LOGGABLE_CSTR(address));