From a0969405ab5786ef8792f0d3a59b93a32bbb67ba Mon Sep 17 00:00:00 2001 From: Jaemin Ahn Date: Wed, 20 Mar 2013 13:11:58 +0900 Subject: [PATCH] Merge master -> 2.1 branch. Change-Id: Ib58212159c0aaf3a67b60749807a27806edfd77c Signed-off-by: Jaemin Ahn --- inc/FMsgMmsManager.h | 1 + inc/FMsgPushManager.h | 1 + inc/FMsgSmsManager.h | 9 +++++++++ inc/FMsgWapPushManager.h | 4 ++++ 4 files changed, 15 insertions(+) mode change 100755 => 100644 inc/FMsgMmsManager.h mode change 100755 => 100644 inc/FMsgPushManager.h mode change 100755 => 100644 inc/FMsgSmsManager.h mode change 100755 => 100644 inc/FMsgWapPushManager.h diff --git a/inc/FMsgMmsManager.h b/inc/FMsgMmsManager.h old mode 100755 new mode 100644 index a5e5f2c..3b7ff6d --- a/inc/FMsgMmsManager.h +++ b/inc/FMsgMmsManager.h @@ -139,6 +139,7 @@ namespace Tizen { namespace Messaging * @param[in] listener The listener to receive a send result asynchronously * @exception E_SUCCESS The method is successful. * @exception E_OUT_OF_MEMORY The memory is insufficient. + * @exception E_UNSUPPORTED_OPERATION The device does not support the MMS feature. @b Since: @b 2.1 */ result Construct(IMmsListener &listener); diff --git a/inc/FMsgPushManager.h b/inc/FMsgPushManager.h old mode 100755 new mode 100644 index 34cdb9a..ec94b38 --- a/inc/FMsgPushManager.h +++ b/inc/FMsgPushManager.h @@ -165,6 +165,7 @@ public: * @exception E_OUT_OF_MEMORY The memory is insufficient. * @exception E_SYSTEM A system error has occurred. * @exception E_PRIVILEGE_DENIED The application does not have the privilege to call this method. + * @exception E_UNSUPPORTED_OPERATION The device does not support the push messaging feature. @b Since: @b 2.1 * @see IPushManagerListener * @see IPushEventListener */ diff --git a/inc/FMsgSmsManager.h b/inc/FMsgSmsManager.h old mode 100755 new mode 100644 index 6ca5d4e..453f62d --- a/inc/FMsgSmsManager.h +++ b/inc/FMsgSmsManager.h @@ -142,6 +142,7 @@ namespace Tizen { namespace Messaging * @param[in] listener The listener to receive a send result asynchronously * @exception E_SUCCESS The method is successful. * @exception E_OUT_OF_MEMORY The memory is insufficient. + * @exception E_UNSUPPORTED_OPERATION The device does not support the SMS feature. @b Since: @b 2.1 */ result Construct(ISmsListener& listener); @@ -380,6 +381,7 @@ namespace Tizen { namespace Messaging * @exception E_SUCCESS The method is successful. * @exception E_SYSTEM A system error has occurred. * @exception E_PRIVILEGE_DENIED The application does not have the privilege to call this method. + * @exception E_UNSUPPORTED_OPERATION The device does not support the CBS feature. @b Since: @b 2.1 * @see ICbsMessageEventListener */ result SetCbsMessageEventListener(ICbsMessageEventListener* pListener); @@ -397,6 +399,7 @@ namespace Tizen { namespace Messaging * @exception E_SUCCESS The method is successful. * @exception E_SYSTEM A system error has occurred. * @exception E_PRIVILEGE_DENIED The application does not have the privilege to call this method. + * @exception E_UNSUPPORTED_OPERATION The device does not support the CBS feature. @b Since: @b 2.1 * @see IEtwsPrimaryNotificationEventListener */ result SetEtwsPrimaryNotificationEventListener(IEtwsPrimaryNotificationEventListener* pListener); @@ -415,6 +418,7 @@ namespace Tizen { namespace Messaging * @exception E_SUCCESS The method is successful. * @exception E_SYSTEM A system error has occurred. * @exception E_PRIVILEGE_DENIED The application does not have the privilege to call this method. + * @exception E_UNSUPPORTED_OPERATION The device does not support the CBS feature. @b Since: @b 2.1 */ result SetSavingToCbsBoxEnabled(bool enable); @@ -446,6 +450,7 @@ namespace Tizen { namespace Messaging * @exception E_SUCCESS The method is successful. * @exception E_SYSTEM A system error has occurred. * @exception E_PRIVILEGE_DENIED The application does not have the privilege to call this method. + * @exception E_UNSUPPORTED_OPERATION The device does not support the CBS feature. @b Since: @b 2.1 * @see IsCbsEnabled() */ result SetCbsEnabled(bool enable); @@ -475,6 +480,7 @@ namespace Tizen { namespace Messaging * @exception E_ILLEGAL_ACCESS The application does not have the permission to add the CBS channel. * @exception E_SYSTEM A system error has occurred. * @exception E_PRIVILEGE_DENIED The application does not have the privilege to call this method. + * @exception E_UNSUPPORTED_OPERATION The device does not support the CBS feature. @b Since: @b 2.1 * @see RemoveCbsChannel() */ result AddCbsChannel(int from, int to, Tizen::Base::String& name, bool activate = true); @@ -500,6 +506,7 @@ namespace Tizen { namespace Messaging * @exception E_ILLEGAL_ACCESS The application does not have the permission to remove the CBS channel. * @exception E_SYSTEM A system error has occurred. * @exception E_PRIVILEGE_DENIED The application does not have the privilege to call this method. + * @exception E_UNSUPPORTED_OPERATION The device does not support the CBS feature. @b Since: @b 2.1 * @see AddCbsChannel() */ result RemoveCbsChannel(int from, int to); @@ -523,6 +530,7 @@ namespace Tizen { namespace Messaging * - The range (@c to - @c from) exceeds the limit (0xFFFF). * @exception E_SYSTEM A system error has occurred. * @exception E_PRIVILEGE_DENIED The application does not have the privilege to call this method. + * @exception E_UNSUPPORTED_OPERATION The device does not support the CBS feature. @b Since: @b 2.1 * @remarks The specific error code can be accessed using the GetLastResult() method. * @see AddCbsChannel() * @see RemoveCbsChannel() @@ -541,6 +549,7 @@ namespace Tizen { namespace Messaging * @exception E_SUCCESS The method is successful. * @exception E_SYSTEM A system error has occurred. * @exception E_PRIVILEGE_DENIED The application does not have the privilege to call this method. + * @exception E_UNSUPPORTED_OPERATION The device does not support the CBS feature. @b Since: @b 2.1 * @remarks The specific error code can be accessed using the GetLastResult() method. * @see AddCbsChannel() * @see RemoveCbsChannel() diff --git a/inc/FMsgWapPushManager.h b/inc/FMsgWapPushManager.h old mode 100755 new mode 100644 index f74dd59..75c4f32 --- a/inc/FMsgWapPushManager.h +++ b/inc/FMsgWapPushManager.h @@ -79,6 +79,7 @@ public: * @exception E_INVALID_ARG The specified @c wapApplicationId is invalid. * @exception E_SYSTEM A system error has occurred. * @exception E_PRIVILEGE_DENIED The application does not have the privilege to call this method. + * @exception E_UNSUPPORTED_OPERATION The device does not support the WAP Push feature. @b Since: @b 2.1 * @see IWapPushEventListener * @see RemoveWapPushEventListener() */ @@ -103,6 +104,7 @@ public: * @exception E_INVALID_ARG The specified @c wapApplicationId is invalid. * @exception E_SYSTEM A system error has occurred. * @exception E_PRIVILEGE_DENIED The application does not have the privilege to call this method. + * @exception E_UNSUPPORTED_OPERATION The device does not support the WAP Push feature. @b Since: @b 2.1 * @see IWapPushEventListener * @see AddWapPushEventListener() */ @@ -124,6 +126,7 @@ public: * @exception E_ILLEGAL_ACCESS The application does not have the permission to register the conditions. * @exception E_SYSTEM A system error has occurred. * @exception E_PRIVILEGE_DENIED The application does not have the privilege to call this method. + * @exception E_UNSUPPORTED_OPERATION The device does not support the WAP Push feature. @b Since: @b 2.1 * @see UnregisterCondition() */ result RegisterCondition(const Tizen::Base::String& wapApplicationId, const Tizen::Base::String& contentType); @@ -144,6 +147,7 @@ public: * @exception E_ILLEGAL_ACCESS The application does not have the permission to unregister the conditions. * @exception E_SYSTEM A system error has occurred. * @exception E_PRIVILEGE_DENIED The application does not have the privilege to call this method. + * @exception E_UNSUPPORTED_OPERATION The device does not support the WAP Push feature. @b Since: @b 2.1 * @see RegisterCondition() */ result UnregisterCondition(const Tizen::Base::String& wapApplicationId, const Tizen::Base::String& contentType); -- 2.7.4