Add E_USER_NOT_CONSENTED

Change-Id: I3d8564df7846a89dcd47c687988e879c320fd5f2
Signed-off-by: Woowon <woowon.park@samsung.com>

diff --git a/inc/FNetNfcNdefPushManager.h b/inc/FNetNfcNdefPushManager.h
index 0cd28a3..c614465 100755 (executable)
--- a/inc/FNetNfcNdefPushManager.h
+++ b/inc/FNetNfcNdefPushManager.h
@@ -96,6 +96,7 @@ public:
         *                                      Application Filtering</a>.
         * @exception   E_OPERATION_FAILED      The operation has failed.
         * @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
         * @remarks     Before calling this method, check whether the feature is supported by %Tizen::System::SystemInfo::GetValue()
         *              methods.
         */
@@ -125,6 +126,7 @@ public:
         *                                      Application Filtering</a>.
         * @exception   E_OPERATION_FAILED      The operation has failed.
         * @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
         * @remarks     Before calling this method, check whether the feature is supported by %Tizen::System::SystemInfo::GetValue()
         *              methods.
         */
@@ -288,6 +290,7 @@ public:
         *                                      <a href="../org.tizen.gettingstarted/html/tizen_overview/application_filtering.htm">
         *                                      Application Filtering</a>.
         * @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
         * @exception   E_SYSTEM                The method cannot proceed due to a severe system error.
         * @see         <a href="../org.tizen.native.appprogramming/html/guide/net/nfc_reserved_push.htm">
         *              The NFC Reserved Push guide</a>
@@ -317,6 +320,7 @@ public:
         *                                      <a href="../org.tizen.gettingstarted/html/tizen_overview/application_filtering.htm">
         *                                      Application Filtering</a>.
         * @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
         * @exception   E_SYSTEM                The method cannot proceed due to a severe system error.
         * @see         <a href="../org.tizen.native.appprogramming/html/guide/net/nfc_reserved_push.htm">
         *              The NFC Reserved Push guide</a>

diff --git a/inc/FNetNfcNfcManager.h b/inc/FNetNfcNfcManager.h
index 2d72bbf..b47f6e6 100755 (executable)
--- a/inc/FNetNfcNfcManager.h
+++ b/inc/FNetNfcNfcManager.h
@@ -212,6 +212,7 @@ public:
         *                                      operation. @n
         *                                      For example, the NFC feature is already activated.
         * @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
         * @exception   E_SYSTEM                A system error has occurred.
         * @see         INfcManagerEventListener::OnNfcActivated()
         */
@@ -231,6 +232,7 @@ public:
         *                                      operation. @n
         *                                      For example, the NFC feature is already deactivated.
         * @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
         * @exception   E_SYSTEM                A system error has occurred.
         * @see         INfcManagerEventListener::OnNfcDeactivated()
         */
@@ -272,6 +274,7 @@ public:
         * @exception   E_CONNECTION_FAILED     The connection to the tag is closed or has failed.
         * @exception   E_OUT_OF_MEMORY         The memory is insufficient.
         * @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
         * @exception   E_SYSTEM                A system error has occurred.
         * @remarks
         *              - The NdefTagConnection class can inherit the TagConnection class if the currently detected tag
@@ -294,6 +297,7 @@ public:
         * @exception   E_SUCCESS               The method is successful.
         * @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
         * @exception   E_SYSTEM                A system error has occurred.
         * @remarks     This method can be invoked several times with different Tizen::Net::Nfc::NfcTagType values for the
         *              same listener instance. In this case, the listener is called if the specified type of the target
@@ -315,6 +319,7 @@ public:
         * @exception   E_SUCCESS               The method is successful.
         * @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
         * @exception   E_SYSTEM                A system error has occurred.
         */
        result RemoveTagDiscoveryEventListener(INfcTagDiscoveryEventListener& listener, NfcTagType type);
@@ -337,6 +342,7 @@ public:
         *                                      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
         * @exception   E_SYSTEM                A system error has occurred.
         * @remarks
         *              - This method can be invoked several times with different NdefRecordType values for the same
@@ -365,6 +371,7 @@ public:
         *                                      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
         * @exception   E_SYSTEM                A system error has occurred.
         */
        result RemoveNdefMessageDiscoveryEventListener(INdefMessageDiscoveryEventListener& listener, const NdefRecordType& type);
@@ -382,6 +389,7 @@ public:
         * @exception   E_OBJ_ALREADY_EXIST     The listener is already added.
         * @exception   E_OUT_OF_MEMORY         The memory is insufficient.
         * @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
         * @exception   E_SYSTEM                A system error has occurred.
         */
        result AddDeviceDiscoveryEventListener(INfcDeviceDiscoveryEventListener& listener);
@@ -399,6 +407,7 @@ public:
         * @exception   E_SUCCESS               The method is successful.
         * @exception   E_OBJ_NOT_FOUND         The listener 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
         * @exception   E_SYSTEM                A system error has occurred.
         */
        result RemoveDeviceDiscoveryEventListener(INfcDeviceDiscoveryEventListener& listener);
@@ -434,6 +443,7 @@ public:
         * @exception   E_INVALID_FORMAT        The cached data cannot be converted to the NDEF message.
         * @exception   E_OUT_OF_MEMORY         The memory is insufficient.
         * @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
         * @exception   E_SYSTEM                A system error has occurred.
         * @remarks
         *              - The input NdefMessage instance should be deleted by the application after it is used, even
@@ -467,6 +477,7 @@ public:
         *                                      <a href="../org.tizen.gettingstarted/html/tizen_overview/application_filtering.htm">
         *                                      Application Filtering</a>.
         * @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
         * @exception   E_SYSTEM                A system error has occurred.
         * @remarks
         *              - Note that this method is used to enable or disable the launch pop-up when the application is in

diff --git a/src/FNetNfcNdefPushManager.cpp b/src/FNetNfcNdefPushManager.cpp
index 5dee1f5..8ebcdd3 100644 (file)
--- a/src/FNetNfcNdefPushManager.cpp
+++ b/src/FNetNfcNdefPushManager.cpp
@@ -67,8 +67,8 @@ NdefPushManager::SetNdefPushManagerListener(INdefPushManagerListener* pListener)
 
        // Privilege check
        r = _AccessController::CheckUserPrivilege(_PRV_NFC_P2P);
-       r = TransExceptionsExclusive(r, E_PRIVILEGE_DENIED, E_OUT_OF_MEMORY);
-       SysTryReturnResult(NID_NET_NFC, r == E_SUCCESS, r, "The application does not have the privilege to call this method.");
+       r = TransExceptionsExclusive(r, E_PRIVILEGE_DENIED, E_OUT_OF_MEMORY, E_USER_NOT_CONSENTED);
+       SysTryReturnResult(NID_NET_NFC, r == E_SUCCESS, r, "The application is not permitted to call this method.");
 
        r = __pImpl->SetNdefPushManagerListener(pListener);
        SysTryReturnResult(NID_NET_NFC, r == E_SUCCESS, r, "Failed to add the callback to _NfcSystemAdapter.");
@@ -90,8 +90,8 @@ NdefPushManager::Push(const NdefMessage& message)
 
        // Privilege check
        r = _AccessController::CheckUserPrivilege(_PRV_NFC_P2P);
-       r = TransExceptionsExclusive(r, E_PRIVILEGE_DENIED, E_OUT_OF_MEMORY);
-       SysTryReturnResult(NID_NET_NFC, r == E_SUCCESS, r, "The application does not have the privilege to call this method.");
+       r = TransExceptionsExclusive(r, E_PRIVILEGE_DENIED, E_OUT_OF_MEMORY, E_USER_NOT_CONSENTED);
+       SysTryReturnResult(NID_NET_NFC, r == E_SUCCESS, r, "The application is not permitted to call this method.");
 
        r = __pImpl->Push(message);
        SysTryReturnResult(NID_NET_NFC, r == E_SUCCESS, r, "Failed to push NDEF message.");
@@ -110,8 +110,8 @@ NdefPushManager::RegisterNdefPushMessage(const NdefMessage& message, const Tizen
 
        // Privilege check
        r = _AccessController::CheckUserPrivilege(_PRV_NFC_P2P);
-       r = TransExceptionsExclusive(r, E_PRIVILEGE_DENIED, E_OUT_OF_MEMORY);
-       SysTryReturnResult(NID_NET_NFC, r == E_SUCCESS, r, "The application does not have the privilege to call this method.");
+       r = TransExceptionsExclusive(r, E_PRIVILEGE_DENIED, E_OUT_OF_MEMORY, E_USER_NOT_CONSENTED);
+       SysTryReturnResult(NID_NET_NFC, r == E_SUCCESS, r, "The application is not permitted to call this method.");
 
        return _NdefPushManagerImpl::RegisterNdefPushMessage(message, description);
 }
@@ -127,8 +127,8 @@ NdefPushManager::UnregisterNdefPushMessage(void)
 
        // Privilege check
        r = _AccessController::CheckUserPrivilege(_PRV_NFC_P2P);
-       r = TransExceptionsExclusive(r, E_PRIVILEGE_DENIED, E_OUT_OF_MEMORY);
-       SysTryReturnResult(NID_NET_NFC, r == E_SUCCESS, r, "The application does not have the privilege to call this method.");
+       r = TransExceptionsExclusive(r, E_PRIVILEGE_DENIED, E_OUT_OF_MEMORY, E_USER_NOT_CONSENTED);
+       SysTryReturnResult(NID_NET_NFC, r == E_SUCCESS, r, "The application is not permitted to call this method.");
 
        return _NdefPushManagerImpl::UnregisterNdefPushMessage();
 }

diff --git a/src/FNetNfcNfcManager.cpp b/src/FNetNfcNfcManager.cpp
index b910a94..5645c7a 100644 (file)
--- a/src/FNetNfcNfcManager.cpp
+++ b/src/FNetNfcNfcManager.cpp
@@ -92,13 +92,11 @@ NfcManager::Activate(void)
 
        // Privilege check
        r = _AccessController::CheckUserPrivilege(_PRV_NFC_ADMIN);
-       r = TransExceptionsExclusive(r, E_PRIVILEGE_DENIED, E_OUT_OF_MEMORY);
-       SysTryReturnResult(NID_NET_NFC, r == E_SUCCESS, r,
-                       "The application does not have the privilege to call this method.");
+       r = TransExceptionsExclusive(r, E_PRIVILEGE_DENIED, E_OUT_OF_MEMORY, E_USER_NOT_CONSENTED);
+       SysTryReturnResult(NID_NET_NFC, r == E_SUCCESS, r, "The application is not permitted to call this method.");
 
        SysAssertf(__pImpl != null,     "Not yet constructed. Construct() should be called before use.");
 
-
        return __pImpl->Activate();
 }
 
@@ -109,9 +107,8 @@ NfcManager::Deactivate(void)
 
        // Privilege check
        r = _AccessController::CheckUserPrivilege(_PRV_NFC_ADMIN);
-       r = TransExceptionsExclusive(r, E_PRIVILEGE_DENIED, E_OUT_OF_MEMORY);
-       SysTryReturnResult(NID_NET_NFC, r == E_SUCCESS, r,
-                       "The application does not have the privilege to call this method.");
+       r = TransExceptionsExclusive(r, E_PRIVILEGE_DENIED, E_OUT_OF_MEMORY, E_USER_NOT_CONSENTED);
+       SysTryReturnResult(NID_NET_NFC, r == E_SUCCESS, r, "The application is not permitted to call this method.");
 
        SysAssertf(__pImpl != null,     "Not yet constructed. Construct() should be called before use.");
 
@@ -143,8 +140,8 @@ NfcManager::GetCurrentTagConnectionN(void) const
 
        // Privilege check
        r = _AccessController::CheckUserPrivilege(_PRV_NFC_TAG);
-       r = TransExceptionsExclusive(r, E_PRIVILEGE_DENIED, E_OUT_OF_MEMORY);
-       TryCatch(r == E_SUCCESS, , "[%s] The application does not have the privilege to call this method.", GetErrorMessage(r));
+       r = TransExceptionsExclusive(r, E_PRIVILEGE_DENIED, E_OUT_OF_MEMORY, E_USER_NOT_CONSENTED);
+       TryCatch(r == E_SUCCESS, , "[%s] The application is not permitted to call this method.", GetErrorMessage(r));
 
        SysAssertf(__pImpl != null, "Not yet constructed. Construct() should be called before use.");
 
@@ -170,8 +167,8 @@ NfcManager::GetCachedNdefMessageN(void)
 
        // Privilege check
        r = _AccessController::CheckUserPrivilege(_PRV_NFC_COMMON);
-       r = TransExceptionsExclusive(r, E_PRIVILEGE_DENIED, E_OUT_OF_MEMORY);
-       TryCatch(r == E_SUCCESS, , "[%s] The application does not have the privilege to call this method.", GetErrorMessage(r));
+       r = TransExceptionsExclusive(r, E_PRIVILEGE_DENIED, E_OUT_OF_MEMORY, E_USER_NOT_CONSENTED);
+       TryCatch(r == E_SUCCESS, , "[%s] The application is not permitted to call this method.", GetErrorMessage(r));
 
        return _NfcManagerImpl::GetCachedNdefMessageN();
 
@@ -193,9 +190,8 @@ NfcManager::SetLaunchPopupEnabled(bool enable)
 
        // Privilege check
        r = _AccessController::CheckUserPrivilege(_PRV_NFC_COMMON);
-       r = TransExceptionsExclusive(r, E_PRIVILEGE_DENIED, E_OUT_OF_MEMORY);
-       SysTryReturnResult(NID_NET_NFC, r == E_SUCCESS, r,
-                       "The application does not have the privilege to call this method.");
+       r = TransExceptionsExclusive(r, E_PRIVILEGE_DENIED, E_OUT_OF_MEMORY, E_USER_NOT_CONSENTED);
+       SysTryReturnResult(NID_NET_NFC, r == E_SUCCESS, r,      "The application is not permitted to call this method.");
 
        return _NfcManagerImpl::SetLaunchPopupEnabled(enable);
 }
@@ -207,9 +203,8 @@ NfcManager::AddTagDiscoveryEventListener(INfcTagDiscoveryEventListener& listener
 
        // Privilege check
        r = _AccessController::CheckUserPrivilege(_PRV_NFC_TAG);
-       r = TransExceptionsExclusive(r, E_PRIVILEGE_DENIED, E_OUT_OF_MEMORY);
-       SysTryReturnResult(NID_NET_NFC, r == E_SUCCESS, r,
-                       "The application does not have the privilege to call this method.");
+       r = TransExceptionsExclusive(r, E_PRIVILEGE_DENIED, E_OUT_OF_MEMORY, E_USER_NOT_CONSENTED);
+       SysTryReturnResult(NID_NET_NFC, r == E_SUCCESS, r,      "The application is not permitted to call this method.");
 
        SysAssertf(__pImpl != null, "Not yet constructed. Construct() should be called before use.");
 
@@ -223,9 +218,8 @@ NfcManager::RemoveTagDiscoveryEventListener(INfcTagDiscoveryEventListener& liste
 
        // Privilege check
        r = _AccessController::CheckUserPrivilege(_PRV_NFC_TAG);
-       r = TransExceptionsExclusive(r, E_PRIVILEGE_DENIED, E_OUT_OF_MEMORY);
-       SysTryReturnResult(NID_NET_NFC, r == E_SUCCESS, r,
-                       "The application does not have the privilege to call this method.");
+       r = TransExceptionsExclusive(r, E_PRIVILEGE_DENIED, E_OUT_OF_MEMORY, E_USER_NOT_CONSENTED);
+       SysTryReturnResult(NID_NET_NFC, r == E_SUCCESS, r,      "The application is not permitted to call this method.");
 
        SysAssertf(__pImpl != null, "Not yet constructed. Construct() should be called before use.");
 
@@ -239,9 +233,8 @@ NfcManager::AddNdefMessageDiscoveryEventListener(INdefMessageDiscoveryEventListe
 
        // Privilege check
        r = _AccessController::CheckUserPrivilege(_PRV_NFC_COMMON);
-       r = TransExceptionsExclusive(r, E_PRIVILEGE_DENIED, E_OUT_OF_MEMORY);
-       SysTryReturnResult(NID_NET_NFC, r == E_SUCCESS, r,
-                       "The application does not have the privilege to call this method.");
+       r = TransExceptionsExclusive(r, E_PRIVILEGE_DENIED, E_OUT_OF_MEMORY, E_USER_NOT_CONSENTED);
+       SysTryReturnResult(NID_NET_NFC, r == E_SUCCESS, r,      "The application is not permitted to call this method.");
 
        SysAssertf(__pImpl != null, "Not yet constructed. Construct() should be called before use.");
 
@@ -256,9 +249,8 @@ NfcManager::RemoveNdefMessageDiscoveryEventListener(INdefMessageDiscoveryEventLi
 
        // Privilege check
        r = _AccessController::CheckUserPrivilege(_PRV_NFC_COMMON);
-       r = TransExceptionsExclusive(r, E_PRIVILEGE_DENIED, E_OUT_OF_MEMORY);
-       SysTryReturnResult(NID_NET_NFC, r == E_SUCCESS, r,
-                       "The application does not have the privilege to call this method.");
+       r = TransExceptionsExclusive(r, E_PRIVILEGE_DENIED, E_OUT_OF_MEMORY, E_USER_NOT_CONSENTED);
+       SysTryReturnResult(NID_NET_NFC, r == E_SUCCESS, r,      "The application is not permitted to call this method.");
 
        SysAssertf(__pImpl != null, "Not yet constructed. Construct() should be called before use.");
 
@@ -273,9 +265,8 @@ NfcManager::AddDeviceDiscoveryEventListener(INfcDeviceDiscoveryEventListener& li
 
        // Privilege check
        r = _AccessController::CheckUserPrivilege(_PRV_NFC_P2P);
-       r = TransExceptionsExclusive(r, E_PRIVILEGE_DENIED, E_OUT_OF_MEMORY);
-       SysTryReturnResult(NID_NET_NFC, r == E_SUCCESS, r,
-                       "The application does not have the privilege to call this method.");
+       r = TransExceptionsExclusive(r, E_PRIVILEGE_DENIED, E_OUT_OF_MEMORY, E_USER_NOT_CONSENTED);
+       SysTryReturnResult(NID_NET_NFC, r == E_SUCCESS, r,      "The application is not permitted to call this method.");
 
        SysAssertf(__pImpl != null, "Not yet constructed. Construct() should be called before use.");
 
@@ -289,9 +280,8 @@ NfcManager::RemoveDeviceDiscoveryEventListener(INfcDeviceDiscoveryEventListener&
 
        // Privilege check
        r = _AccessController::CheckUserPrivilege(_PRV_NFC_P2P);
-       r = TransExceptionsExclusive(r, E_PRIVILEGE_DENIED, E_OUT_OF_MEMORY);
-       SysTryReturnResult(NID_NET_NFC, r == E_SUCCESS, r,
-                       "The application does not have the privilege to call this method.");
+       r = TransExceptionsExclusive(r, E_PRIVILEGE_DENIED, E_OUT_OF_MEMORY, E_USER_NOT_CONSENTED);
+       SysTryReturnResult(NID_NET_NFC, r == E_SUCCESS, r,      "The application is not permitted to call this method.");
 
        SysAssertf(__pImpl != null, "Not yet constructed. Construct() should be called before use.");