merge in jb-release history after reset to jb-dev
diff --git a/src/adapter.c b/src/adapter.c
index 0ddbda9..08cd94f 100755
--- a/src/adapter.c
+++ b/src/adapter.c
@@ -3396,11 +3396,18 @@
icon = class_to_icon(dev->class);
if (!dev->alias) {
+#ifdef ANDROID
+ /* Android doesn't fallback to name or address if there is no alias.
+ It's safe to set alias to NULL because dict_append_entry() will
+ silently return and not set the property when value is NULL. */
+ alias = NULL;
+#else
if (!dev->name) {
alias = g_strdup(peer_addr);
g_strdelimit(alias, ":", '-');
} else
alias = g_strdup(dev->name);
+#endif
} else
alias = g_strdup(dev->alias);
diff --git a/src/device.c b/src/device.c
index 8728644..7324c36 100755
--- a/src/device.c
+++ b/src/device.c
@@ -279,6 +279,13 @@
ptr = device->name;
dict_append_entry(&dict, "Name", DBUS_TYPE_STRING, &ptr);
+#ifdef ANDROID
+ /* Alias (Android doesn't fallback to name or address) */
+ if (device->alias != NULL) {
+ ptr = device->alias;
+ dict_append_entry(&dict, "Alias", DBUS_TYPE_STRING, &ptr);
+ }
+#else
/* Alias (fallback to name or address) */
if (device->alias != NULL)
ptr = device->alias;
@@ -288,6 +295,7 @@
}
dict_append_entry(&dict, "Alias", DBUS_TYPE_STRING, &ptr);
+#endif
/* Class */
if (read_remote_class(&src, &device->bdaddr, &class) == 0) {
