From 288f8f9218ffab73a1b6c57765ff85368292e633 Mon Sep 17 00:00:00 2001 From: Szymon Janc Date: Thu, 27 Mar 2014 14:03:50 +0100 Subject: [PATCH] android/bluetooth: Send friendly name property when sending name --- android/bluetooth.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/android/bluetooth.c b/android/bluetooth.c index 661aa528e..06bb9bf61 100644 --- a/android/bluetooth.c +++ b/android/bluetooth.c @@ -1236,6 +1236,15 @@ static void update_new_device(struct device *dev, int8_t rssi, size += fill_hal_prop(buf + size, HAL_PROP_DEVICE_NAME, strlen(dev->name), dev->name); ev->num_props++; + + /* when updating name also send stored friendly name */ + if (dev->friendly_name) { + size += fill_hal_prop(buf + size, + HAL_PROP_DEVICE_FRIENDLY_NAME, + strlen(dev->friendly_name), + dev->friendly_name); + ev->num_props++; + } } ipc_send_notif(hal_ipc, HAL_SERVICE_ID_BLUETOOTH, HAL_EV_DEVICE_FOUND, @@ -1298,6 +1307,15 @@ static void update_device(struct device *dev, int8_t rssi, size += fill_hal_prop(buf + size, HAL_PROP_DEVICE_NAME, strlen(dev->name), dev->name); ev->num_props++; + + /* when updating name also send stored friendly name */ + if (dev->friendly_name) { + size += fill_hal_prop(buf + size, + HAL_PROP_DEVICE_FRIENDLY_NAME, + strlen(dev->friendly_name), + dev->friendly_name); + ev->num_props++; + } } if (ev->num_props) -- 2.47.3