commit bbd928af568ec934033063740ba7c89b32701b96
author Jakub Pawlowski <jpawlowski@google.com> Mon Jun 30 14:25:33 2025 +0200
committer Jakub Pawłowski <jpawlowski@google.com> Mon Jun 30 13:49:03 2025 -0700
tree 5d13d0f57b21903716d988cf3da9efd2bcb4dec8
parent 58ed95deb0b82a06955446b6c4ae6911418554bc

Remove flag le_disconnect_notification_handling

Flag: EXEMPT removing le_disconnect_notification_handling
Bug: 403433488
Test: mma -j32
Change-Id: I224aa4c365760ef6ded5fe37562186143172508f

flags/gap.aconfig

diff --git a/flags/gap.aconfig b/flags/gap.aconfig
index 933961b..b89f290 100644
--- a/flags/gap.aconfig
+++ b/flags/gap.aconfig
@@ -121,16 +121,6 @@
 }
 
 flag {
-    name: "le_disconnect_notification_handling"
-    namespace: "bluetooth"
-    description: "Fix LE link disconnection notification to stack's upper layers"
-    bug: "403433488"
-    metadata {
-        purpose: PURPOSE_BUGFIX
-    }
-}
-
-flag {
     name: "rssi_scan_filter"
     namespace: "bluetooth"
     is_exported: true

system/bta/dm/bta_dm_act.cc

diff --git a/system/bta/dm/bta_dm_act.cc b/system/bta/dm/bta_dm_act.cc
index b40a272..0cae15a 100644
--- a/system/bta/dm/bta_dm_act.cc
+++ b/system/bta/dm/bta_dm_act.cc
@@ -1395,45 +1395,6 @@
 
 /*******************************************************************************
  *
- * Function         bta_dm_get_conn_info_
- *
- * Description      This function retrieves the connection information.
- *
- * Returns          connection information
- *
- ******************************************************************************/
-// Remove when le_disconnect_notification_handling is shipped
-static tBTA_DM_CONNECTION_INFO bta_dm_get_conn_info_(const RawAddress& target) {
-  // Find all aliases and connection status on all transports
-  RawAddress pseudo_addr = target;
-  RawAddress identity_addr = target;
-  bool le_connected = false;
-  bool bredr_connected = false;
-  tBTA_DM_CONNECTION_INFO conn_info;
-
-  le_connected = get_btm_client_interface().peer.BTM_ReadConnectedTransportAddress(
-          &pseudo_addr, BT_TRANSPORT_LE);
-  if (pseudo_addr.IsEmpty()) {
-    pseudo_addr = target;
-  }
-
-  bredr_connected = get_btm_client_interface().peer.BTM_ReadConnectedTransportAddress(
-          &identity_addr, BT_TRANSPORT_BR_EDR);
-  /* If connection not found with identity address, check with pseudo address if different */
-  if (!bredr_connected && identity_addr != pseudo_addr) {
-    identity_addr = pseudo_addr;
-    bredr_connected = get_btm_client_interface().peer.BTM_ReadConnectedTransportAddress(
-            &identity_addr, BT_TRANSPORT_BR_EDR);
-  }
-  if (identity_addr.IsEmpty()) {
-    identity_addr = target;
-  }
-  conn_info = {pseudo_addr, identity_addr, le_connected, bredr_connected};
-  return conn_info;
-}
-
-/*******************************************************************************
- *
  * Function         bta_dm_get_conn_info
  *
  * Description      This function retrieves the connection information.
@@ -1449,10 +1410,6 @@
   bool bredr_connected = false;
   tBTA_DM_CONNECTION_INFO conn_info;
 
-  if (!com::android::bluetooth::flags::le_disconnect_notification_handling()) {
-    return bta_dm_get_conn_info_(target);
-  }
-
   // Get identity and pseudo address
   std::pair<RawAddress, RawAddress> pseudo_identity_addr_pair =
           get_btm_client_interface().peer.BTM_GetConnectedTransportAddress(target);