javaextensions/bluetooth/bluetoothcommons/bluetoothplatformcontrol/src.s60/s60bluetoothplatformcontrol.cpp
--- a/javaextensions/bluetooth/bluetoothcommons/bluetoothplatformcontrol/src.s60/s60bluetoothplatformcontrol.cpp Fri Sep 17 08:28:21 2010 +0300
+++ b/javaextensions/bluetooth/bluetoothcommons/bluetoothplatformcontrol/src.s60/s60bluetoothplatformcontrol.cpp Mon Oct 04 00:10:53 2010 +0300
@@ -364,11 +364,11 @@
TInt error = RProperty::Get(KPropertyUidBluetoothCategory,
KPropertyKeyBluetoothGetDeviceName, bluetoothName);
- if (error != KErrNone)
+ if (error != KErrNone || (0 == bluetoothName.Length()))
{
+ ELOG(EJavaBluetooth, "Bluetooth friendly name was not set");
return NULL;
}
-
std::wstring *deviceName =
new std::wstring((wchar_t*) bluetoothName.Ptr());