Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 392b79ef authored by Jakub Pawlowski's avatar Jakub Pawlowski Committed by android-build-merger
Browse files

Fix BLE device reconnections am: 8d93cead 

am: 6d3ffe03

Change-Id: Ic5ea31634ee6fe5f254310f67298881fdc83490a
parents 8743a833 6d3ffe03

system/stack/btm/btm_ble_bgconn.cc

+3 −6
Original line number Diff line number Diff line
@@ -178,8 +178,7 @@ bool BTM_BackgroundConnectAddressKnown(const RawAddress& address) { 
    return true;



  // bonded device with identity address known

  if (p_dev_rec->ble.identity_addr != address &&

      !p_dev_rec->ble.identity_addr.IsEmpty()) {

  if (!p_dev_rec->ble.identity_addr.IsEmpty()) {

    return true;

  }
@@ -205,8 +204,7 @@ bool btm_add_dev_to_controller(bool to_add, const RawAddress& bd_addr) { 


  if (p_dev_rec != NULL && p_dev_rec->device_type & BT_DEVICE_TYPE_BLE) {

    if (to_add) {

      if (p_dev_rec->ble.identity_addr != bd_addr &&

          !p_dev_rec->ble.identity_addr.IsEmpty()) {

      if (!p_dev_rec->ble.identity_addr.IsEmpty()) {

        background_connection_add(p_dev_rec->ble.identity_addr_type,

                                  p_dev_rec->ble.identity_addr);

      } else {
@@ -220,8 +218,7 @@ bool btm_add_dev_to_controller(bool to_add, const RawAddress& bd_addr) { 


      p_dev_rec->ble.in_controller_list |= BTM_WHITE_LIST_BIT;

    } else {

      if (!p_dev_rec->ble.identity_addr.IsEmpty() &&

          p_dev_rec->ble.identity_addr != bd_addr) {

      if (!p_dev_rec->ble.identity_addr.IsEmpty()) {

        background_connection_remove(p_dev_rec->ble.identity_addr);

      } else {

        background_connection_remove(bd_addr);