---
android/gatt.c | 27 +++++++++++++--------------
1 file changed, 13 insertions(+), 14 deletions(-)
diff --git a/android/gatt.c b/android/gatt.c
index 348a2a2..31a535c 100644
--- a/android/gatt.c
+++ b/android/gatt.c
@@ -1837,6 +1837,15 @@ static bool trigger_connection(struct app_connection *connection)
return ret;
}
+static void remove_autoconnect_device(struct gatt_device *dev)
+{
+ bt_auto_connect_remove(&dev->bdaddr);
+ device_unref(dev);
+
+ if (dev->state == DEVICE_CONNECT_INIT)
+ device_set_state(dev, DEVICE_DISCONNECTED);
+}
+
static void clear_autoconnect_devices(int app_id)
{
struct gatt_device *dev;
@@ -1849,13 +1858,8 @@ static void clear_autoconnect_devices(int app_id)
while (dev) {
queue_remove(dev->autoconnect_apps, INT_TO_PTR(app_id));
- if (queue_isempty(dev->autoconnect_apps)) {
- bt_auto_connect_remove(&dev->bdaddr);
- device_unref(dev);
-
- if (dev->state == DEVICE_CONNECT_INIT)
- device_set_state(dev, DEVICE_DISCONNECTED);
- }
+ if (queue_isempty(dev->autoconnect_apps))
+ remove_autoconnect_device(dev);
dev = find_device_by_autoconnect_app_id(app_id);
};
@@ -6812,11 +6816,6 @@ void bt_gatt_remove_autoconnect(unsigned int id, const bdaddr_t *addr)
queue_remove(dev->autoconnect_apps, INT_TO_PTR(id));
- if (queue_isempty(dev->autoconnect_apps)) {
- bt_auto_connect_remove(addr);
- device_unref(dev);
-
- if (dev->state == DEVICE_CONNECT_INIT)
- device_set_state(dev, DEVICE_DISCONNECTED);
- }
+ if (queue_isempty(dev->autoconnect_apps))
+ remove_autoconnect_device(dev);
}
--
1.8.4
--
To unsubscribe from this list: send the line "unsubscribe linux-bluetooth" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
