device: Add "Bonded" flag to dbus property

Add "Bonded" to dbus device property table. When setting the "Bonded
flag, check the status of the Bonded property first. If the Bonded
property is changed, send property changed signal.

Reviewed-by: Sonny Sasaka <sonnysasaka@chromium.org>
Reviewed-by: Yun-Hao Chung <howardchung@chromium.org>
Signed-off-by: Manika Shrivastava <manika.sh@samsung.com>
Signed-off-by: Ayush Garg <ayush.garg@samsung.com>

diff --git a/src/device.c b/src/device.c
index 60ff675..ead0e99 100644 (file)
--- a/src/device.c
+++ b/src/device.c
@@ -1400,6 +1400,22 @@ static gboolean dev_property_get_paired(const GDBusPropertyTable *property,
        return TRUE;
 }
 
+static gboolean dev_property_get_bonded(const GDBusPropertyTable *property,
+                                       DBusMessageIter *iter, void *data)
+{
+       struct btd_device *dev = data;
+       dbus_bool_t val;
+
+       if (dev->bredr_state.bonded || dev->le_state.bonded)
+               val = TRUE;
+       else
+               val = FALSE;
+
+       dbus_message_iter_append_basic(iter, DBUS_TYPE_BOOLEAN, &val);
+
+       return TRUE;
+}
+
 static gboolean dev_property_get_legacy(const GDBusPropertyTable *property,
                                        DBusMessageIter *iter, void *data)
 {
@@ -5487,6 +5503,7 @@ static const GDBusPropertyTable device_properties[] = {
        { "Icon", "s", dev_property_get_icon, NULL,
                                        dev_property_exists_icon },
        { "Paired", "b", dev_property_get_paired },
+       { "Bonded", "b", dev_property_get_bonded },
        { "Trusted", "b", dev_property_get_trusted, dev_property_set_trusted },
        { "Blocked", "b", dev_property_get_blocked, dev_property_set_blocked },
        { "LegacyPairing", "b", dev_property_get_legacy },
@@ -9335,17 +9352,30 @@ void btd_device_set_trusted_profiles(struct btd_device *device,
 
 void device_set_bonded(struct btd_device *device, uint8_t bdaddr_type)
 {
+       struct bearer_state *state;
+
        if (!device)
                return;
 
-       DBG("");
+       state = get_state(device, bdaddr_type);
 
-       if (bdaddr_type == BDADDR_BREDR)
-               device->bredr_state.bonded = true;
-       else
-               device->le_state.bonded = true;
+       if (state->bonded)
+               return;
+
+       DBG("setting bonded for device to true");
+
+       state->bonded = true;
 
        btd_device_set_temporary(device, false);
+
+       /* If the other bearer state was already true we don't need to
+        * send any property signals.
+        */
+       if (device->bredr_state.bonded == device->le_state.bonded)
+               return;
+
+       g_dbus_emit_property_changed(dbus_conn, device->path,
+                                               DEVICE_INTERFACE, "Bonded");
 }
 
 void device_set_legacy(struct btd_device *device, bool legacy)