From 3c7f2c94309a1a579b83d598c951104f3c1ed641 Mon Sep 17 00:00:00 2001 From: Szymon Janc Date: Fri, 21 Feb 2014 17:49:52 +0100 Subject: [PATCH] android/bluetooth: Don't set remote name to empty string If remote device has name but it is empty (0 bytes) just ignore it and continue using address as name. This will avoid sending remote device property notification with empty name. --- android/bluetooth.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/android/bluetooth.c b/android/bluetooth.c index 66177e58f..ac4c2137a 100644 --- a/android/bluetooth.c +++ b/android/bluetooth.c @@ -1098,7 +1098,7 @@ static void update_new_device(struct device *dev, int8_t rssi, ev->num_props++; } - if (eir->name) { + if (eir->name && strlen(eir->name)) { g_free(dev->name); dev->name = g_strdup(eir->name); size += fill_hal_prop(buf + size, HAL_PROP_DEVICE_NAME, @@ -1138,7 +1138,7 @@ static void update_device(struct device *dev, int8_t rssi, ev->num_props++; } - if (eir->name && strcmp(dev->name, eir->name)) { + if (eir->name && strlen(eir->name) && strcmp(dev->name, eir->name)) { g_free(dev->name); dev->name = g_strdup(eir->name); size += fill_hal_prop(buf + size, HAL_PROP_DEVICE_NAME, -- 2.47.3