diff options
author | Jake Hamby <jhamby@google.com> | 2012-06-05 16:44:24 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2012-06-05 16:44:24 -0700 |
commit | b296ea3a8fb3123377a8795c37357e9e684f5924 (patch) | |
tree | fa69ce14f8d29f9896b1d384a11c243037b6eff4 | |
parent | cfad6c4a8173d8917ca72b279b3ab4af9552f109 (diff) | |
parent | e73c02b4397b97f6bc5b7fd862ca3babf18da497 (diff) | |
download | bluez-b296ea3a8fb3123377a8795c37357e9e684f5924.tar.gz |
am e73c02b4: Don\'t return a fallback value for Alias property of BT device.
* commit 'e73c02b4397b97f6bc5b7fd862ca3babf18da497':
Don't return a fallback value for Alias property of BT device.
-rwxr-xr-x | src/adapter.c | 7 | ||||
-rwxr-xr-x | src/device.c | 8 |
2 files changed, 15 insertions, 0 deletions
diff --git a/src/adapter.c b/src/adapter.c index 0ddbda94..08cd94f3 100755 --- a/src/adapter.c +++ b/src/adapter.c @@ -3396,11 +3396,18 @@ void adapter_emit_device_found(struct btd_adapter *adapter, 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 87286449..7324c360 100755 --- a/src/device.c +++ b/src/device.c @@ -279,6 +279,13 @@ static DBusMessage *get_properties(DBusConnection *conn, 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 @@ static DBusMessage *get_properties(DBusConnection *conn, } dict_append_entry(&dict, "Alias", DBUS_TYPE_STRING, &ptr); +#endif /* Class */ if (read_remote_class(&src, &device->bdaddr, &class) == 0) { |