Merge branch 'master' into release-2.2.2

This commit is contained in:
Chatura Dilan Perera 2016-09-29 21:31:18 +05:30
commit d2bb23208d

View File

@ -320,10 +320,10 @@ public class SyncmlServiceImpl implements SyncmlService {
macAddressProperty.setValue(macAddress);
existingProperties.add(macAddressProperty);
Device.Property resolutionProperty = new Device.Property();
resolutionProperty.setName(PluginConstants.SyncML.DEVICE_INFO);
resolutionProperty.setValue("null");
existingProperties.add(resolutionProperty);
// Device.Property resolutionProperty = new Device.Property();
// resolutionProperty.setName(PluginConstants.SyncML.DEVICE_INFO);
// resolutionProperty.setValue("null");
// existingProperties.add(resolutionProperty);
Device.Property deviceNameProperty = new Device.Property();
deviceNameProperty.setName(PluginConstants.SyncML.DEVICE_NAME);