From: 胡传军 <1224667075@qq.com>
Date: Tue, 12 Nov 2024 10:14:48 +0000 (+0000)
Subject: Merge #1390 into sdk602patch0911 from refs/changes/1390/head
X-Git-Tag: fd230_release_V1.3.102~86^2~6
X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=5a513add51cec87c1ee105189f6dffd68d984055;p=mirrors%2FFD230.git

Merge #1390 into sdk602patch0911 from refs/changes/1390/head

增加在产测蓝牙测试的退出时的关闭蓝牙扫描

* refs/changes/1390/head: (1 commits squashed)

  - 增加在产测蓝牙测试的退出时的关闭蓝牙扫描

Signed-off-by: aliyun8003852482 <1224667075@qq.com>
Reviewed-by: Caisking <3449750381@qq.com>
Reviewed-by: 罗正 <1732036298@qq.com>
Reviewed-by: aliyun8003852482 <1224667075@qq.com>
Reviewed-by: snickersun@163.com <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.com>
Reviewed-by: aliyun6865282430 <1624952103@qq.com>
Merged-by: Caisking <3449750381@qq.com>

CR-link: https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230/change/1390
---

diff --git a/code/sdk/application/wearable/fd230app/nativeui/producttest/src/testbt.cpp b/code/sdk/application/wearable/fd230app/nativeui/producttest/src/testbt.cpp
index 71a5668df..c4652c8a2 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/producttest/src/testbt.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/producttest/src/testbt.cpp
@@ -92,6 +92,9 @@ namespace OHOS
                     label_BR_SCAN[i]=nullptr;
                 }
             }
+
+            bool ret = gap_br_cancel_discovery();
+
             BluetoothModel::GetInstance()->set_test_bt_falg(false);
 
             uint8_t cnt = pm_veto_get_id_cnt(PM_ID_P_TEST);