Merge TP1A.220609.001

Change-Id: I6c3c168fb196a53feb1d2688b74bea4fdbc5b3e8

1 files changed, 0 insertions, 4 deletions

diff --git a/system/stack/acl/ble_acl.cc b/system/stack/acl/ble_acl.cc
index 448dabd12c..a09012a37b 100644
--- a/system/stack/acl/ble_acl.cc
+++ b/system/stack/acl/ble_acl.cc
@@ -65,8 +65,6 @@ static bool acl_ble_common_connection(const tBLE_BD_ADDR& address_with_type,
     return false;
   }
 
-  btm_ble_disable_resolving_list(BTM_BLE_RL_INIT, true);
-
   /* Tell BTM Acl management about the link */
   btm_acl_created(address_with_type.bda, handle, role, BT_TRANSPORT_LE);
 
@@ -154,12 +152,10 @@ void acl_ble_connection_fail(const tBLE_BD_ADDR& address_with_type,
   if (status != HCI_ERR_ADVERTISING_TIMEOUT) {
     btm_cb.ble_ctr_cb.set_connection_state_idle();
     btm_ble_clear_topology_mask(BTM_BLE_STATE_INIT_BIT);
-    btm_ble_disable_resolving_list(BTM_BLE_RL_INIT, true);
     connection_manager::on_connection_timed_out_from_shim(
         address_with_type.bda);
   } else {
     btm_cb.ble_ctr_cb.inq_var.adv_mode = BTM_BLE_ADV_DISABLE;
-    btm_ble_disable_resolving_list(BTM_BLE_RL_ADV, true);
   }
   btm_ble_update_mode_operation(HCI_ROLE_UNKNOWN, &address_with_type.bda,
                                 status);