summaryrefslogtreecommitdiff
path: root/bta/dm/bta_dm_act.cc
diff options
context:
space:
mode:
authoralk3pInjection <webmaster@raspii.tech>2023-06-02 00:30:40 +0800
committeralk3pInjection <webmaster@raspii.tech>2023-06-02 00:30:40 +0800
commitb5b7ccf6def93ede838bf60345104b688f1d5632 (patch)
tree4eb12c4c287cf0369a782d94f3732ac6417fc21d /bta/dm/bta_dm_act.cc
parent810097b0cf3fbccb54027c408db59023f0bc13ed (diff)
parent913e85217c103e559d6d2c1a9528ef796744e57b (diff)
Merge tag 'LA.QSSI.13.0.r1-10200-qssi.0' into tachibanaHEADtachibana
"LA.QSSI.13.0.r1-10200-qssi.0" Change-Id: I4db0203d2218efb18f82aa939e00f946f7361b84
Diffstat (limited to 'bta/dm/bta_dm_act.cc')
-rw-r--r--bta/dm/bta_dm_act.cc3
1 files changed, 1 insertions, 2 deletions
diff --git a/bta/dm/bta_dm_act.cc b/bta/dm/bta_dm_act.cc
index 6d7b04614..4c4546210 100644
--- a/bta/dm/bta_dm_act.cc
+++ b/bta/dm/bta_dm_act.cc
@@ -2865,8 +2865,7 @@ static void bta_dm_rem_name_cback (const RawAddress& bd_addr, DEV_CLASS dc, BD_N
/* If Discovery complete callback is pending to be given to upper layer when
* cancel remote name request is called on cancelling discovery then cancel
* the discovery_cb_alarm and give discovery complete callback to upper layer */
- if (bta_dm_search_cb.disc_cmpl_cb_pending &&
- bta_dm_search_cb.state == BTA_DM_SEARCH_IDLE) {
+ if (bta_dm_search_cb.disc_cmpl_cb_pending) {
if (alarm_is_scheduled(bta_dm_search_cb.discovery_cb_alarm)) {
APPL_TRACE_DEBUG("%s: RNR completed, cancel discovery_cb_alarm", __func__);
alarm_free(bta_dm_search_cb.discovery_cb_alarm);