Merge branch 'tizen_2.4' into HEAD

Conflicts:
	packaging/webapi-plugins.spec
	src/archive/filesystem_node.cc
	src/bookmark/bookmark_instance.cc
	src/common/extension.cc
	src/contact/contact_util.cc
	src/exif/exif_tag_saver.cc
	src/filesystem/filesystem_manager.cc
	src/filesystem/filesystem_stat.cc
	src/messaging/message.cc
	src/messaging/messaging_util.cc
	src/nfc/nfc_adapter.cc
	src/nfc/nfc_instance.cc
	src/notification/notification_manager.cc
	src/systeminfo/systeminfo-utils.cpp
	src/systemsetting/systemsetting_instance.cc

Change-Id: Ia15074aed590534d371f955c11a502216c9d08a7

diff --cc packaging/webapi-plugins.spec
index 0857040,348f517..d651006
--- 1/packaging/webapi-plugins.spec
--- 2/packaging/webapi-plugins.spec
+++ b/packaging/webapi-plugins.spec
@@@ -17,11 -13,11 +17,11 @@@ Source0:    %{name}-%{version}.tar.g
  
  
  ####################################################################
- #       Mobile Profile :  Redwood(SM-Z910F)       #
+ #       Mobile Profile :  Redwood(SM-Z910F), KIRAN(Z130H)          #
  ####################################################################
 -%if "%{?tizen_profile_name}" == "mobile"
 +%if "%{?profile}" == "mobile"
  
 -%define tizen_privilege_engine                    ACE
 +%define tizen_privilege_engine                    CYNARA
  
  %define tizen_feature_account_support             1
  %define tizen_feature_alarm_support               1
@@@ -71,12 -61,10 +65,10 @@@
  %define tizen_feature_message_port_support        1
  %define tizen_feature_messaging_support           1
  
- %ifarch %{arm}
- # ARM
+ %if 0%{?model_build_feature_nfc}
  %define tizen_feature_nfc_emulation_support       0
 -%define tizen_feature_nfc_support                 1
 +%define tizen_feature_nfc_support                 0
  %else
- # I586
  %define tizen_feature_nfc_emulation_support       0
  %define tizen_feature_nfc_support                 0
  %endif
@@@ -146,8 -134,7 +138,7 @@@
  # Badge API is mandatory in Tizen Wearable Profile.
  %define tizen_feature_badge_support               1
  
- 
 -%define tizen_feature_bluetooth_support           1
 +%define tizen_feature_bluetooth_support           0
  
  # Bookmark API is optional in Tizen Wearable Profile.
  %define tizen_feature_bookmark_support            0

diff --cc src/application/application_manager.cc
Simple merge

diff --cc src/archive/archive_manager.h
Simple merge

diff --cc src/bluetooth/bluetooth_gatt_service.cc
Simple merge

diff --cc src/datacontrol/datacontrol_instance.cc
Simple merge

diff --cc src/download/download_instance.cc
Simple merge

diff --cc src/nfc/nfc_adapter.cc
Simple merge

diff --cc src/systeminfo/systeminfo-utils.cpp
index 287bfcd,db4a81f..83aea8b
--- 1/src/systeminfo/systeminfo-utils.cpp
--- 2/src/systeminfo/systeminfo-utils.cpp
+++ b/src/systeminfo/systeminfo-utils.cpp
@@@ -984,11 -1022,7 +1023,6 @@@ PlatformResult SystemInfoListeners::Reg
        CHECK_LISTENER_ERROR(RegisterVconfCallback(VCONFKEY_SYSMAN_HDMI,
                                                   OnPeripheralChangedCb, instance))
      }
-     // TODO(r.galka) temporarily removed - not supported by platform
-     //if (-1 != vconf_get_int(VCONFKEY_POPSYNC_ACTIVATED_KEY, &value)) {
-     //  CHECK_LISTENER_ERROR(RegisterVconfCallback(VCONFKEY_POPSYNC_ACTIVATED_KEY,
-     //                                             OnPeripheralChangedCb, instance))
-     //}
 -
      LoggerD("Added callback for PERIPHERAL");
      m_peripheral_listener = callback;
    }

diff --cc src/systeminfo/systeminfo-utils.h
Simple merge

diff --cc src/systeminfo/systeminfo.gyp
index d07276f,1137ebf..fdb582e
--- 1/src/systeminfo/systeminfo.gyp
--- 2/src/systeminfo/systeminfo.gyp
+++ b/src/systeminfo/systeminfo.gyp
@@@ -32,12 -32,8 +32,9 @@@
              'capi-network-connection',
              'capi-system-device',
              'capi-system-system-settings',
-             'capi-network-bluetooth',
-             'capi-network-wifi',
              'tapi',
              'sensor',
 +            'libtzplatform-config',
              ]
            },
          }],

diff --cc src/systemsetting/systemsetting_instance.cc
index f6f3595,05ae631..b9c9b09
--- 1/src/systemsetting/systemsetting_instance.cc
--- 2/src/systemsetting/systemsetting_instance.cc
+++ b/src/systemsetting/systemsetting_instance.cc
@@@ -118,14 -118,13 +118,14 @@@ PlatformResult SystemSettingInstance::g
    switch (ret) {
      case SYSTEM_SETTINGS_ERROR_NONE:
        LoggerD("ret == SYSTEM_SETTINGS_ERROR_NONE");
-       result_obj.insert(std::make_pair("value", picojson::value(value)));
+       result_obj.insert(std::make_pair("value", picojson::value(value ? value : "")));
        free(value);
        return PlatformResult(ErrorCode::NO_ERROR);
 -    case SYSTEM_SETTINGS_ERROR_CALL_UNSUPPORTED_API:
 -      LoggerD("ret == SYSTEM_SETTINGS_ERROR_CALL_UNSUPPORTED_API");
 -      return PlatformResult(ErrorCode::NOT_SUPPORTED_ERR,
 -                            "This property is not supported.");
 +    // TODO(p.kaczmarek3) temporarily removed - not supported by platform
 +    //case SYSTEM_SETTINGS_ERROR_CALL_UNSUPPORTED_API:
 +    //  LoggerD("ret == SYSTEM_SETTINGS_ERROR_CALL_UNSUPPORTED_API");
 +    //  return PlatformResult(ErrorCode::NOT_SUPPORTED_ERR,
 +    //                        "This property is not supported.");
      default:
        LoggerD("Other error");
        return PlatformResult(ErrorCode::UNKNOWN_ERR);