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

Commit 76ef442b authored by Chris Manton's avatar Chris Manton Committed by Automerger Merge Worker
Browse files

stack::rnr::btm_initiate_rem_name Promote primary execution to top level block... 

stack::rnr::btm_initiate_rem_name Promote primary execution to top level block am: abe0db8b am: 28727b3a

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/3185051



Change-Id: I855effcc07a58851bac86b62a8182c8ededa338a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 1820ac55 28727b3a

system/stack/btm/btm_inq.cc

+36 −36
Original line number Diff line number Diff line
@@ -1851,7 +1851,8 @@ tBTM_STATUS btm_initiate_rem_name(const RawAddress& remote_bda, uint64_t timeout 
  }

  if (btm_cb.rnr.remname_active) {

    return BTM_BUSY;

  } else {

  }



  /* If the database entry exists for the device, use its clock offset */

  tINQ_DB_ENT* p_i = btm_inq_db_find(remote_bda);

  if (p_i && (p_i->inq_info.results.inq_result_type & BT_DEVICE_TYPE_BREDR)) {
@@ -1894,7 +1895,6 @@ tBTM_STATUS btm_initiate_rem_name(const RawAddress& remote_bda, uint64_t timeout 


  return BTM_CMD_STARTED;

}

}



/*******************************************************************************

 *