DBG("Send Adapter properties changed event to HAL user, Num Prop [%d] total size [%d]", ev->num_props, size);
event_cb(HAL_EV_ADAPTER_PROPS_CHANGED, buf, size);
}
- g_variant_unref(value);
+
DBG("-");
}
DBG("Device Name [%s] Property num [%d]", name, ev->num_props);
}
} else if (strcasecmp(key, "Connected") == 0) {
- unsigned int connected = g_variant_get_uint32(val);
+ unsigned int connected = g_variant_get_byte(val);
size += __bt_insert_hal_properties(buf + size, HAL_PROP_DEVICE_CONNECTED,
sizeof(unsigned int), &connected);
size += __bt_insert_hal_properties(buf + size, HAL_PROP_DEVICE_CLASS,
sizeof(unsigned int), &class);
ev->num_props++;
- g_variant_unref(tmp_value);
+ if (tmp_value)
+ g_variant_unref(tmp_value);
/* Connected */
sizeof(unsigned int), &connected);
ev->num_props++;
DBG("Device connected [%u] Property num [%d]", connected, ev->num_props);
- g_variant_unref(tmp_value);
+ if (tmp_value)
+ g_variant_unref(tmp_value);
/* Trust */
tmp_value = g_variant_lookup_value(value, "Trusted", G_VARIANT_TYPE_BOOLEAN);
sizeof(uint8_t), &trust);
ev->num_props++;
DBG("Device trusted [%d] Property num [%d]", trust, ev->num_props);
- g_variant_unref(tmp_value);
+ if (tmp_value)
+ g_variant_unref(tmp_value);
/* Paired */
tmp_value = g_variant_lookup_value(value, "Paired", G_VARIANT_TYPE_BOOLEAN);
sizeof(uint8_t), &paired);
ev->num_props++;
DBG("Device Paired [%d] Property num [%d]", paired, ev->num_props);
- g_variant_unref(tmp_value);
+ if (tmp_value)
+ g_variant_unref(tmp_value);
/* RSSI*/
tmp_value = g_variant_lookup_value(value, "RSSI", G_VARIANT_TYPE_INT32);
sizeof(int), &rssi);
ev->num_props++;
DBG("Device RSSI [%d] Property num [%d]", rssi, ev->num_props);
- g_variant_unref(tmp_value);
+ if (tmp_value)
+ g_variant_unref(tmp_value);
/* Last Addr Type */
tmp_value = g_variant_lookup_value(value, "LastAddrType", G_VARIANT_TYPE_UINT32);
unsigned int addr_type = tmp_value ? g_variant_get_uint32(tmp_value) : 0;
- g_variant_unref(tmp_value);
+ if (tmp_value)
+ g_variant_unref(tmp_value);
DBG("Device Last Address Type [0x%x]", addr_type);
/* Is Alias Set */
sizeof(uint8_t), &is_alias_set);
ev->num_props++;
DBG("IsAliasSet: [%s], Property num [%d]", (is_alias_set ? "TRUE" : "FALSE"), ev->num_props);
- g_variant_unref(tmp_value);
+ if (tmp_value)
+ g_variant_unref(tmp_value);
/* UUID's */
tmp_value = g_variant_lookup_value(value, "UUIDs", G_VARIANT_TYPE_STRING_ARRAY);
ERR("manufacturer_data_len is too long(len = %d)", manufacturer_data_len);
manufacturer_data_len = BT_HAL_MANUFACTURER_DATA_LENGTH_MAX;
}
- g_variant_unref(tmp_value);
+ if (tmp_value)
+ g_variant_unref(tmp_value);
/*size += __bt_insert_hal_properties(buf + size, HAL_PROP_DEVICE_MANUFACTURER_DATA_LEN,
sizeof(unsigned int), &manufacturer_data_len);
ev->num_props++;*/
ev->num_props++;
}
}
- g_variant_unref(tmp_value);
+ if (tmp_value)
+ g_variant_unref(tmp_value);
/* Address */
uint8_t bdaddr[6];