Remove the LE scan trigger when the LE scan stop is called 35/100835/1
authorLee Hyuk <hyuk0512.lee@samsung.com>
Tue, 29 Nov 2016 10:21:15 +0000 (19:21 +0900)
committerLee Hyuk <hyuk0512.lee@samsung.com>
Tue, 29 Nov 2016 10:21:15 +0000 (19:21 +0900)
Change-Id: Ia54b94de659a0f063441454cc4f8a2717c16bd7e
Signed-off-by: Lee Hyuk <hyuk0512.lee@samsung.com>
src/adapter.c

index 37297ed..9d76e64 100644 (file)
@@ -1980,7 +1980,7 @@ static gboolean start_le_discovery_timeout(gpointer user_data)
 
        DBG("");
 
-       adapter->discovery_idle_timeout = 0;
+       adapter->le_discovery_idle_timeout = 0;
 
        new_type = SCAN_TYPE_LE;
 
@@ -4033,6 +4033,14 @@ static DBusMessage *adapter_stop_le_discovery(DBusConnection *conn,
 
        DBG("sender %s", sender);
 
+#ifdef TIZEN_FEATURE_BLUEZ_MODIFY
+       if (adapter->le_discovery_idle_timeout > 0) {
+               DBG("Remove LE scan trigger");
+               g_source_remove(adapter->le_discovery_idle_timeout);
+               adapter->le_discovery_idle_timeout = 0;
+       }
+#endif
+
        if (!(adapter->current_settings & MGMT_SETTING_POWERED))
                return btd_error_not_ready(msg);