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

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

Encapsulate RNR timeout value to compilation unit am: 28365816 

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



Change-Id: Ide3e15d0d071df60a8a9dd5021f1c20c5c13e7c2
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents badf6244 28365816

system/stack/btm/btm_inq.cc

+1 −0
Original line number Diff line number Diff line
@@ -719,6 +719,7 @@ tBTM_STATUS BTM_StartInquiry(tBTM_INQ_RESULTS_CB* p_results_cb, 
 *                  BTM_WRONG_MODE if the device is not up.

 *

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

#define BTM_EXT_RMT_NAME_TIMEOUT_MS (40 * 1000) /* 40 seconds */

tBTM_STATUS BTM_ReadRemoteDeviceName(const RawAddress& remote_bda,

                                     tBTM_NAME_CMPL_CB* p_cb,

                                     tBT_TRANSPORT transport) {

system/stack/btm/neighbor_inquiry.h

+0 −2
Original line number Diff line number Diff line
@@ -225,8 +225,6 @@ typedef void(tBTM_NAME_CMPL_CB)(const tBTM_REMOTE_DEV_NAME*); 
typedef struct {

  tBTM_NAME_CMPL_CB* p_remname_cmpl_cb;



#define BTM_EXT_RMT_NAME_TIMEOUT_MS (40 * 1000) /* 40 seconds */



  alarm_t* remote_name_timer;

  alarm_t* classic_inquiry_timer;