Lipasto

Diff between ba0d6157704c34965d776fea106acf801e7e6d92 and 3c7f2c94309a1a579b83d598c951104f3c1ed641

Changed Files

File	Additions	Deletions	Status
android/bluetooth.c	+2	-2	modified

Full Patch

diff --git a/android/bluetooth.c b/android/bluetooth.c
index 66177e5..ac4c213 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,