From: Wootak Jung <wootak.jung@samsung.com>
Date: Tue, 14 Feb 2023 05:14:53 +0000 (+0900)
Subject: adapter: Fix pending_settings value not clear issue
X-Git-Tag: accepted/tizen/unified/20230223.162144~1
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F43%2F288243%2F1;p=platform%2Fupstream%2Fbluez.git

adapter: Fix pending_settings value not clear issue

Remove the duplicated connectable mode setting logic

Change-Id: I994a87907394d705a9c20401aff2719845805f7a
Signed-off-by: Wootak Jung <wootak.jung@samsung.com>
---

diff --git a/src/adapter.c b/src/adapter.c
index 334a399..af998b5 100644
--- a/src/adapter.c
+++ b/src/adapter.c
@@ -1167,6 +1167,7 @@ static bool set_discoverable(struct btd_adapter *adapter, uint8_t mode,
 
 	DBG("sending set mode command for index %u", adapter->dev_id);
 
+#ifndef TIZEN_FEATURE_BLUEZ_MODIFY
 	if (btd_has_kernel_features(KERNEL_CONN_CONTROL)) {
 		if (mode)
 			set_mode(adapter, MGMT_OP_SET_CONNECTABLE, mode);
@@ -1175,6 +1176,7 @@ static bool set_discoverable(struct btd_adapter *adapter, uint8_t mode,
 			return set_mode(adapter, MGMT_OP_SET_CONNECTABLE,
 									mode);
 	}
+#endif
 
 	if (mgmt_send(adapter->mgmt, MGMT_OP_SET_DISCOVERABLE,
 				adapter->dev_id, sizeof(cp), &cp,