add patch

diff --git a/inc/FNetNfcINdefMessageDiscoveryEventListener.h b/inc/FNetNfcINdefMessageDiscoveryEventListener.h
index f8c5471..ca8fe32 100644 (file)
--- a/inc/FNetNfcINdefMessageDiscoveryEventListener.h
+++ b/inc/FNetNfcINdefMessageDiscoveryEventListener.h
@@ -63,11 +63,11 @@ public:
         *
         * @param[in]   pMessage        The detected NDEF message
         * @remarks
-        *              - This method can be used for read-only access to the data on the target without opening a
-        *                connection to it.
-        *              - The input NdefMessage object must be deleted by the application after use, even outside this
-        *                method. The NdefMessage::RemoveAllRecords() method must be called with @c true as the input value
-        *                immediately before the NdefMessage object is deleted.
+        *                      - This method can be used for read-only access to the data on the target without opening a
+        *                      connection to it.
+        *                      - The input NdefMessage object must be deleted by the application after use, even outside this
+        *                      method. The NdefMessage::RemoveAllRecords() method must be called with @c true as the input value
+        *                      immediately before the NdefMessage object is deleted.
         */
        virtual void OnNdefMessageDetectedN(NdefMessage* pMessage) = 0;
 

diff --git a/inc/FNetNfcINfcTagDiscoveryEventListener.h b/inc/FNetNfcINfcTagDiscoveryEventListener.h
index 402bb62..7e1df57 100644 (file)
--- a/inc/FNetNfcINfcTagDiscoveryEventListener.h
+++ b/inc/FNetNfcINfcTagDiscoveryEventListener.h
@@ -73,7 +73,7 @@ public:
         * @since       2.0
         *
         * @remarks     The operations of TagConnection returned by OnNfcTagDetectedN() are not processed further after 
-        *              this event is called, that is, the target tag is lost. Moreover, the TagConnection object cannot be 
+        *              this event is called, that is, the target tag is lost. Moreover, the %TagConnection object cannot be 
         *              reused even though the same tag is detected again by the device.
         */
        virtual void OnNfcTagLost(void) = 0;

diff --git a/inc/FNetNfcNdefRecordType.h b/inc/FNetNfcNdefRecordType.h
index 81f398b..4aa6eec 100644 (file)
--- a/inc/FNetNfcNdefRecordType.h
+++ b/inc/FNetNfcNdefRecordType.h
@@ -218,11 +218,11 @@ public:
         * @since       2.0
         *
         * @return      The name of this record type, @n
-        *              else an empty string if the name format is NDEF_TNF_EMPTY or NDEF_TNF_UNKNOWN
+        *                      else an empty string if the name format is ::NDEF_TNF_EMPTY or ::NDEF_TNF_UNKNOWN
         * @remarks
-        *              - The returned name does not have the prefix @c "urn:nfc:wkt:" and @c "urn:nfc:ext:" defined by the
+        *              - The name does not have the prefix @c "urn:nfc:wkt:" and @c "urn:nfc:ext:" defined by the
         *                NFC forum.
-        *              - In case of @c NDEF_TNF_ABSOLUTE_URI name format, this method returns the name in the same format as
+        *              - In case of ::NDEF_TNF_ABSOLUTE_URI name format, this method returns the name in the same format as
         *                it is given in the constructor, that is, with or without percent encoding. The name consists of
         *                the characters encoded using the US_ASCII character set.
         */
@@ -234,17 +234,17 @@ public:
         * @since       2.0
         *
         * @return      An error code
-        * @param[in]   name                        The name of this record type
+        * @param[in]   name                        The name of this record type @n
+        *                                                      The input name must not have the prefix defined by the NFC forum such as @c "urn:nfc:wkt:" and 
+        *                                                      @c "urn:nfc:ext:".
         * @exception   E_SUCCESS                   The method is successful.
-        * @exception   E_INVALID_OPERATION         This operation is not allowed if the name format is NDEF_TNF_EMPTY,
-        *                                          NDEF_TNF_UNKNOWN, or NDEF_TNF_ALL.
+        * @exception   E_INVALID_OPERATION         This operation is not allowed if the name format is ::NDEF_TNF_EMPTY,
+        *                                          ::NDEF_TNF_UNKNOWN, or ::NDEF_TNF_ALL.
         * @exception   E_INVALID_ENCODING_RANGE    The specified input string contains the code points that are outside 
         *                                          the bounds specified by the US_ASCII encoding scheme.
         * @exception   E_INVALID_FORMAT            The specified format of the @c name is invalid as per the 
         *                                          specifications defined for each type of the name format.
         * @exception   E_MAX_EXCEEDED              The length of the name exceeds @c 256 characters.
-        * @remarks     The input name must not have the prefix defined by the NFC forum such as @c "urn:nfc:wkt:" and 
-        *              @c "urn:nfc:ext:".
         */
        result SetName(const Tizen::Base::String& name);
 

diff --git a/inc/FNetNfcNfcManager.h b/inc/FNetNfcNfcManager.h
index f5f6a6b..ca3fd7d 100755 (executable)
--- a/inc/FNetNfcNfcManager.h
+++ b/inc/FNetNfcNfcManager.h
@@ -164,10 +164,6 @@ public:
         * For full construction, the Construct() method must be called right after calling this constructor.
         *
         * @since       2.0
-        *
-        * @remarks     After creating an instance of this class, the Construct() method must be called explicitly to
-        *              initialize this instance.
-        * @see         Construct()
         */
        NfcManager(void);
 
@@ -338,8 +334,8 @@ public:
         * @exception   E_SUCCESS               The method is successful.
         * @exception   E_INVALID_ARG           The specified @c type is invalid. @n
         *                                      For example, the name of the record type is an empty string if the name
-        *                                      format is NDEF_TNF_WELL_KNOWN, NDEF_TNF_MIME_MEDIA, NDEF_TNF_ABSOLUTE_URI,
-        *                                      or NDEF_TNF_EXTERNAL.
+        *                                      format is ::NDEF_TNF_WELL_KNOWN, ::NDEF_TNF_MIME_MEDIA, ::NDEF_TNF_ABSOLUTE_URI,
+        *                                      or ::NDEF_TNF_EXTERNAL.
         * @exception   E_OBJ_ALREADY_EXIST     The listener with the specified type is already added.
         * @exception   E_PRIVILEGE_DENIED      The application does not have the privilege to call this method.
         * @exception   E_USER_NOT_CONSENTED    The user blocks an application from calling this method. @b Since: @b 2.1
@@ -367,8 +363,8 @@ public:
         * @exception   E_SUCCESS               The method is successful.
         * @exception   E_INVALID_ARG           The specified @c type is invalid. @n
         *                                      For example, the name of the record type is an empty string if the name
-        *                                      format is NDEF_TNF_WELL_KNOWN, NDEF_TNF_MIME_MEDIA, NDEF_TNF_ABSOLUTE_URI,
-        *                                      or NDEF_TNF_EXTERNAL.
+        *                                      format is ::NDEF_TNF_WELL_KNOWN, ::NDEF_TNF_MIME_MEDIA, ::NDEF_TNF_ABSOLUTE_URI,
+        *                                      or ::NDEF_TNF_EXTERNAL.
         * @exception   E_OBJ_NOT_FOUND         The listener with the specified type is not found.
         * @exception   E_PRIVILEGE_DENIED      The application does not have the privilege to call this method.
         * @exception   E_USER_NOT_CONSENTED    The user blocks an application from calling this method. @b Since: @b 2.1
@@ -448,7 +444,7 @@ public:
         * @remarks
         *              - The input NdefMessage instance should be deleted by the application after it is used, even
         *                outside this method. The NdefMessage::RemoveAllRecords() method should be called with @c true as
-        *                the input value immediately before the NdefMessage instance is deleted.
+        *                the input value immediately before the %NdefMessage instance is deleted.
         *              - The specific error code can be accessed using the GetLastResult() method.
         *              - Before calling this method, check whether the feature is supported by 
         *                Tizen::System::SystemInfo::GetValue(const Tizen::Base::String&, bool&).

diff --git a/inc/FNetNfcNfcTag.h b/inc/FNetNfcNfcTag.h
index 932e4f0..894538b 100644 (file)
--- a/inc/FNetNfcNfcTag.h
+++ b/inc/FNetNfcNfcTag.h
@@ -50,7 +50,7 @@ class _NfcTagImpl;
  *
  * The %NfcTag class provides information about the detected NFC tag. @n
  * This class has multiple tag types for the target tag. For example, the GetTagTypeList() method returns a list of tag
- * types that include NFC_TAG_TYPE_MIFARE_UL and NFC_TAG_TYPE_FORUM_TYPE_2, because the tag is a Mifare Ultralight tag
+ * types that include ::NFC_TAG_TYPE_MIFARE_UL and ::NFC_TAG_TYPE_FORUM_TYPE_2, because the tag is a Mifare Ultralight tag
  * and it is also an NFC Forum tag type 2.
  *
  * For more information on the class features, see
@@ -65,10 +65,10 @@ public:
         *
         * @since       2.0
         *
-        * @return      The list of the tag types
-        * @remarks     The return list includes single or multiple tags. For example, if the target tag is Mifare
-        *              Ultralight tag type and the NFC Forum tag 2 type, the list includes NFC_TAG_TYPE_MIFARE_UL and
-        *              NFC_TAG_TYPE_FORUM_TYPE_2.
+        * @return      The list of the tag types @n
+        *                      The return list includes single or multiple tags. For example, if the target tag is Mifare
+        *                      Ultralight tag type and the NFC Forum tag 2 type, the list includes @c NFC_TAG_TYPE_MIFARE_UL and
+        *                      @c NFC_TAG_TYPE_FORUM_TYPE_2.
         */
        const Tizen::Base::Collection::IListT <NfcTagType>* GetTagTypeList(void) const;
 

diff --git a/inc/FNetNfcTagConnection.h b/inc/FNetNfcTagConnection.h
index 88e2f1f..4394bd6 100644 (file)
--- a/inc/FNetNfcTagConnection.h
+++ b/inc/FNetNfcTagConnection.h
@@ -174,11 +174,11 @@ public:
         * @since       2.0
         *
         * @return      An error code
-        * @param[in]   pListener           The listener to add
+        * @param[in]   pListener           The listener to add @n
+        *                                              If it is @c null, the listener that is already registered gets unregistered.
         * @exception   E_SUCCESS           The method is successful.
         * @exception   E_SYSTEM            A system error has occurred.
-        * @remarks     Only one event listener can be registered. If the input parameter is @c null, the listener that is
-        *              already registered gets unregistered.
+        * @remarks     Only one event listener can be registered. 
         */
        result SetTagConnectionListener(ITagConnectionListener* pListener);
 

diff --git a/packaging/osp-nfc.spec b/packaging/osp-nfc.spec
index 7983959..49bb3cd 100755 (executable)
--- a/packaging/osp-nfc.spec
+++ b/packaging/osp-nfc.spec
@@ -1,8 +1,9 @@
+%define debug_package %{nil}
 %define __strip /bin/true
 
 Name:          osp-nfc
 Summary:       osp nfc library
-Version:       1.2.1.0
+Version:       1.2.2.0
 Release:       2
 Group:         System/Libraries
 License:       TO_BE/FILLED_IN

diff --git a/src/FNetNfc_NfcAuthorityController.cpp b/src/FNetNfc_NfcAuthorityController.cpp
index 7a65bd0..5ed6489 100644 (file)
--- a/src/FNetNfc_NfcAuthorityController.cpp
+++ b/src/FNetNfc_NfcAuthorityController.cpp
@@ -43,7 +43,6 @@ _NfcAuthorityController::_NfcAuthorityController(void)
 
 _NfcAuthorityController::~_NfcAuthorityController(void)
 {
-       _AppManagerImpl::GetInstance()->RemoveActiveAppEventListener(*this);
        __pSingleton = null;
 }
 
@@ -57,13 +56,13 @@ _NfcAuthorityController::InitSingleton(void)
        SysTryReturnVoidResult(NID_NET_NFC, r == E_SUCCESS, r, "[%s] Propagating.", GetErrorMessage(r));
 
        __pSingleton = pInst.release();
-       std::atexit(DestroySingleton);
+       std::atexit(FinalizeSingleton);
 }
 
 void
-_NfcAuthorityController::DestroySingleton(void)
+_NfcAuthorityController::FinalizeSingleton(void)
 {
-       delete __pSingleton;
+
 }
 
 _NfcAuthorityController*

diff --git a/src/FNetNfc_NfcAuthorityController.h b/src/FNetNfc_NfcAuthorityController.h
index d084d19..b1b46e4 100644 (file)
--- a/src/FNetNfc_NfcAuthorityController.h
+++ b/src/FNetNfc_NfcAuthorityController.h
@@ -81,7 +81,7 @@ private:
        virtual ~_NfcAuthorityController(void);
        result Construct(void);
        static void InitSingleton(void);
-       static void DestroySingleton(void);
+       static void FinalizeSingleton(void);
 
 
        _NfcAuthorityController(const _NfcAuthorityController& value);