--- src/adapter.c | 17 +++++++++-------- 1 files changed, 9 insertions(+), 8 deletions(-) diff --git a/src/adapter.c b/src/adapter.c index 8a10607..15f6d2e 100644 --- a/src/adapter.c +++ b/src/adapter.c @@ -3165,7 +3165,7 @@ void adapter_update_found_devices(struct btd_adapter *adapter, bdaddr_t *bdaddr, gboolean new_dev, legacy; name_status_t name_status; const char *dev_name; - int err; + int err, type; memset(&eir_data, 0, sizeof(eir_data)); err = eir_parse(&eir_data, data, EIR_DATA_LENGTH); @@ -3174,19 +3174,20 @@ void adapter_update_found_devices(struct btd_adapter *adapter, bdaddr_t *bdaddr, return; } - /* the inquiry result can be triggered by NON D-Bus client */ - if (adapter_get_discover_type(adapter) & DISC_RESOLVNAME && - adapter_has_discov_sessions(adapter)) - name_status = NAME_REQUIRED; - else - name_status = NAME_NOT_REQUIRED; - name = read_stored_data(&adapter->bdaddr, bdaddr, "names"); if (pairing_is_legacy(&adapter->bdaddr, bdaddr, data ? TRUE : FALSE, name ? TRUE : FALSE, &legacy) < 0) legacy = TRUE; + type = adapter_get_discover_type(adapter); + + if (!name && type & DISC_RESOLVNAME && + adapter_has_discov_sessions(adapter)) + name_status = NAME_REQUIRED; + else + name_status = NAME_NOT_REQUIRED; + /* Complete EIR names are always used. Shortened EIR names are only * used if there is no name already in storage. */ dev_name = name; -- 1.7.5.rc3 -- 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
