From 7d66e96182342ff3f0076db939ffc982d5e8e1e3 Mon Sep 17 00:00:00 2001 From: Piotr Kosko Date: Mon, 3 Aug 2015 10:36:15 +0200 Subject: [PATCH] [BluetoothLE] Fixed serviceData of BluetoothLEAdvertiseData object [Feature] serviceData is object not an array of objects. [Verification] TCT passrate increased - from 96.50% to 96.89%. BluetoothLEAdvertiseData_serviceData_attribute pass Change-Id: Ie88f9dbe085ba8decdec700bdc2cbc1ea546d31e Signed-off-by: Piotr Kosko --- src/bluetooth/bluetooth_api.js | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) diff --git a/src/bluetooth/bluetooth_api.js b/src/bluetooth/bluetooth_api.js index fac24d6b..0e6c0a40 100755 --- a/src/bluetooth/bluetooth_api.js +++ b/src/bluetooth/bluetooth_api.js @@ -262,14 +262,7 @@ tizen.BluetoothLEAdvertiseData = function(dict) { return serviceData_; }, set: function(v) { - if (T.isNull(v)) { - serviceData_ = v; - } else if (T.isArray(v)) { - for (var i = 0; i < v.length; ++i) { - if (!(v[i] instanceof tizen.BluetoothLEServiceData)) { - return; - } - } + if (T.isNull(v) || (v instanceof tizen.BluetoothLEServiceData)) { serviceData_ = v; } } @@ -340,14 +333,7 @@ tizen.BluetoothLEAdvertiseData = function(dict) { } // serviceData - if (T.isNull(dict.serviceData)) { - o.serviceData = dict.serviceData; - } else if (T.isArray(dict.serviceData)) { - for (var i = 0; i < dict.serviceData.length; ++i) { - if (!(dict.serviceData[i] instanceof tizen.BluetoothLEServiceData)) { - return; - } - } + if (T.isNull(dict.serviceData) || dict.serviceData instanceof tizen.BluetoothLEServiceData) { o.serviceData = dict.serviceData; } else if (!T.isUndefined(dict.serviceData)) { return; -- 2.34.1