Merge branch 'master' into release-2.2.2

revert-dabc3590
Chatura Dilan Perera 8 years ago
commit d2bb23208d

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

Loading…
Cancel
Save