tizen 2.4 release

diff --git a/doc/nfc_doc.h b/doc/nfc_doc.h
index 2cb660d..6b0c137 100755 (executable)
--- a/doc/nfc_doc.h
+++ b/doc/nfc_doc.h
@@ -94,7 +94,7 @@
  *
  * To ensure your application is only running on the device with specific features, please define the features in your manifest file using the manifest editor in the SDK.\n
  *
- * More details on featuring your application can be found from <a href="../org.tizen.mobile.native.appprogramming/html/ide_sdk_tools/feature_element.htm"><b>Feature Element</b>.</a>
+ * More details on featuring your application can be found from <a href="https://developer.tizen.org/development/tools/native-tools/manifest-text-editor#feature"><b>Feature Element</b>.</a>
  *
  */
 
@@ -149,7 +149,7 @@
  *
  * To ensure your application is only running on the device with specific features, please define the features in your manifest file using the manifest editor in the SDK.\n
  *
- * More details on featuring your application can be found from <a href="../org.tizen.mobile.native.appprogramming/html/ide_sdk_tools/feature_element.htm"><b>Feature Element</b>.</a>
+ * More details on featuring your application can be found from <a href="https://developer.tizen.org/development/tools/native-tools/manifest-text-editor#feature"><b>Feature Element</b>.</a>
  *
  */
 
@@ -176,7 +176,7 @@
  *
  * To ensure your application is only running on the device with specific features, please define the features in your manifest file using the manifest editor in the SDK.\n
  *
- * More details on featuring your application can be found from <a href="../org.tizen.mobile.native.appprogramming/html/ide_sdk_tools/feature_element.htm"><b>Feature Element</b>.</a>
+ * More details on featuring your application can be found from <a href="https://developer.tizen.org/development/tools/native-tools/manifest-text-editor#feature"><b>Feature Element</b>.</a>
  *
  */
 
@@ -205,7 +205,7 @@
  *
  * To ensure your application is only running on the device with specific features, please define the features in your manifest file using the manifest editor in the SDK.\n
  *
- * More details on featuring your application can be found from <a href="../org.tizen.mobile.native.appprogramming/html/ide_sdk_tools/feature_element.htm"><b>Feature Element</b>.</a>
+ * More details on featuring your application can be found from <a href="https://developer.tizen.org/development/tools/native-tools/manifest-text-editor#feature"><b>Feature Element</b>.</a>
  *
  */
 
@@ -238,7 +238,7 @@
  *
  * To ensure your application is only running on the device with specific features, please define the features in your manifest file using the manifest editor in the SDK.\n
  *
- * More details on featuring your application can be found from <a href="../org.tizen.mobile.native.appprogramming/html/ide_sdk_tools/feature_element.htm"><b>Feature Element</b>.</a>
+ * More details on featuring your application can be found from <a href="https://developer.tizen.org/development/tools/native-tools/manifest-text-editor#feature"><b>Feature Element</b>.</a>
  *
  */
 
@@ -264,7 +264,7 @@
  *
  * To ensure your application is only running on the device with specific features, please define the features in your manifest file using the manifest editor in the SDK.\n
  *
- * More details on featuring your application can be found from <a href="../org.tizen.mobile.native.appprogramming/html/ide_sdk_tools/feature_element.htm"><b>Feature Element</b>.</a>
+ * More details on featuring your application can be found from <a href="https://developer.tizen.org/development/tools/native-tools/manifest-text-editor#feature"><b>Feature Element</b>.</a>
  *
  */
 
@@ -292,6 +292,6 @@
  *
  * To ensure your application is only running on the device with specific features, please define the features in your manifest file using the manifest editor in the SDK.\n
  *
- * More details on featuring your application can be found from <a href="../org.tizen.mobile.native.appprogramming/html/ide_sdk_tools/feature_element.htm"><b>Feature Element</b>.</a>
+ * More details on featuring your application can be found from <a href="https://developer.tizen.org/development/tools/native-tools/manifest-text-editor#feature"><b>Feature Element</b>.</a>
  *
  */

diff --git a/include/nfc.h b/include/nfc.h
index 601e11d..79094c4 100755 (executable)
--- a/include/nfc.h
+++ b/include/nfc.h
@@ -75,7 +75,7 @@ typedef enum {
        NFC_RECORD_TNF_URI = 0x03,      /**< Absolute URI as defined in RFC 3986 [RFC 3986] */
        NFC_RECORD_TNF_EXTERNAL_RTD = 0x04,     /**< NFC Forum external type [NFC RTD] */
        NFC_RECORD_TNF_UNKNOWN = 0x05,  /**< Unknown\n The payload type is unknown */
-       NFC_RECORD_TNF_UNCHAGNED = 0x06,        /**< It means the payload is an intermediate or final chunk of a chunked NDEF Record */
+       NFC_RECORD_TNF_UNCHANGED = 0x06,        /**< It means the payload is an intermediate or final chunk of a chunked NDEF Record */
 } nfc_record_tnf_e;
 
 
@@ -342,7 +342,7 @@ extern const unsigned char NFC_RECORD_HANDOVER_SELECT_TYPE[2];
 /**
  * @brief Called after nfc_manager_set_activation() has completed.
  * @since_tizen @if MOBILE 2.3 @elseif WEARABLE 2.3.1 @endif
- * @internal
+ * @platform
  * @ingroup CAPI_NETWORK_NFC_MANAGER_MODULE
  *
  * @param [in] error The result
@@ -790,7 +790,7 @@ void nfc_manager_unset_activation_changed_cb(void);
  * @since_tizen @if MOBILE 2.3 @elseif WEARABLE 2.3.1 @endif
  * @privlevel platform
  * @privilege %http://tizen.org/privilege/nfc.admin
- * @internal
+ * @platform
  * @ingroup CAPI_NETWORK_NFC_MANAGER_MODULE
 
  * @param [in] activation The NFC state for setting

diff --git a/src/nfc_card_emulation.c b/src/nfc_card_emulation.c
index fdb7891..f6e65bd 100644 (file)
--- a/src/nfc_card_emulation.c
+++ b/src/nfc_card_emulation.c
@@ -174,6 +174,7 @@ int nfc_se_close_secure_element_internal(nfc_se_h handle)
 
        CHECK_SUPPORTED(NFC_CE_FEATURE);
        CHECK_INIT();
+       CHECK_INVALID(handle == NULL);
 
        result = net_nfc_client_se_close_internal_secure_element_sync(
                (net_nfc_target_handle_h)handle);

diff --git a/src/nfc_p2p_handover.c b/src/nfc_p2p_handover.c
index 68e2b5a..2f91a17 100644 (file)
--- a/src/nfc_p2p_handover.c
+++ b/src/nfc_p2p_handover.c
@@ -232,14 +232,27 @@ int nfc_connection_handover_unset_event_cb(void)
 
 bool nfc_p2p_is_supported_ac_type(nfc_ac_type_e carrier)
 {
-       bool result = false;
+       bool _is_support_p2p = false;
+       bool _is_support_ac_type = false;
 
-       LOG_BEGIN();
+        LOG_BEGIN();
+
+        _is_support_p2p = nfc_common_is_supported(NFC_P2P_FEATURE);
+       if (!_is_support_p2p) {
+               set_last_result(NFC_ERROR_NOT_SUPPORTED);
+               return false;
+       }
 
        if (carrier == NFC_AC_TYPE_BT)
-               result = true;
+               _is_support_ac_type = true;
+
+       if (_is_support_ac_type) {
+               set_last_result(NFC_ERROR_NONE);
+       } else {
+               set_last_result(NFC_ERROR_NOT_SUPPORTED);
+       }
 
-       return result;
+       return _is_support_ac_type;
 }
 
 int nfc_handover_message_import_from_ndef_message(nfc_handover_message_h *result, nfc_ndef_message_h msg)