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

Commit 404d4329 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 5900353 from 0176f320 to qt-qpr1-release 

Change-Id: I076eb675075f732402d7ad1cc829ae3b29f50f48
parents fa963b8c 0176f320

system/stack/btm/btm_ble_bgconn.cc

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

    return true;





  // bonded device with identity address known

  // bonded device with identity address known

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

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

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

    return true;

    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 (p_dev_rec != NULL && p_dev_rec->device_type & BT_DEVICE_TYPE_BLE) {

    if (to_add) {

    if (to_add) {

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

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

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

        background_connection_add(p_dev_rec->ble.identity_addr_type,

        background_connection_add(p_dev_rec->ble.identity_addr_type,

                                  p_dev_rec->ble.identity_addr);

                                  p_dev_rec->ble.identity_addr);

      } else {

      } 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;

      p_dev_rec->ble.in_controller_list |= BTM_WHITE_LIST_BIT;

    } else {

    } else {

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

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

          p_dev_rec->ble.identity_addr != bd_addr) {

        background_connection_remove(p_dev_rec->ble.identity_addr);

        background_connection_remove(p_dev_rec->ble.identity_addr);

      } else {

      } else {

        background_connection_remove(bd_addr);

        background_connection_remove(bd_addr);