Sychronized tizen_2.1 branch with master

Change-Id: I6407d2cf5f49b276ba49b25f6a32b0046478e6a8
Signed-off-by: Minjae Lee <minjae17.lee@samsung.com>

diff --git a/inc/FNetNetAccountManager.h b/inc/FNetNetAccountManager.h
index 12394f4..45f5865 100755 (executable)
--- a/inc/FNetNetAccountManager.h
+++ b/inc/FNetNetAccountManager.h
@@ -98,6 +98,7 @@ public:
         * @exception           E_MAX_EXCEEDED          The registry is full. @n Cannot create a new network account.
         * @exception           E_SYSTEM                        An internal 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 telephony feature. @b Since: @b 2.1
         * @remarks                     This method creates a new network account and returns a @c NetAccountId value that can be used in method calls later to operate on the
         *                                      account. If @c INVALID_HANDLE is returned, the specific error code can be accessed using the GetLastResult() method. A Wi-Fi account
         *                                      cannot be created using %NetAccountManager.
@@ -148,6 +149,7 @@ public:
         * @exception           E_SYSTEM                        An internal error has occurred.
         * @exception           E_INVALID_OPERATION     This operation is not allowed on this network account instance.
         * @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 telephony feature. @b Since: @b 2.1
         * @remarks                     This method fails if the network account is read-only, in service, or created by another application.
         *                                      A Wi-Fi account cannot be updated using %NetAccountManager.
         *                                      Before calling this method, the user must call GetNetAccountInfoN() to get the latest information in the registry
@@ -175,6 +177,7 @@ public:
         * @exception   E_INVALID_ACCOUNT      The input account ID is invalid.
         * @exception   E_OPERATION_FAILED     This request operation has failed due to an internal error.
         * @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 telephony or MMS feature. @b Since: @b 2.1
         * @see         GetNetAccountInfoN()
         * @see                 UpdateNetAccount()
         */
@@ -259,6 +262,7 @@ public:
         * @param[in]   netBearerType           The network account type of bearer
         * @exception   E_SUCCESS                       The method is successful.
         * @exception   E_SYSTEM                        An internal error has occurred (baseband).
+        * @exception     E_UNSUPPORTED_OPERATION       The specified @c netBearerType is not supported by this device. @b Since: @b 2.1
         * @remarks             The specific error code can be accessed using the GetLastResult() method.
         *                              If INVALID_HANDLE is returned but the last result shows success, @n
         *              show a pop-up that asks the user to select the network profile in the Settings menu.
@@ -280,6 +284,7 @@ public:
         * @exception   E_INVALID_ARG           The @c netAccountName is invalid or %NetAccountInfo with this name does not exist.
         * @exception   E_SYSTEM                        An internal error has occurred.
         * @exception   E_PRIVILEGE_DENIED      The application does not have the privilege to call this method.
+        * @exception     E_UNSUPPORTED_OPERATION       The specified @c netProfileName is not supported by this device. @b Since: @b 2.1
         * @remarks             The specific error code can be accessed using the GetLastResult() method.
         */
        NetAccountId GetAppNetAccountId(const Tizen::Base::String& netProfileName) const;
@@ -333,6 +338,7 @@ public:
         * @exception           E_SUCCESS                       The method is successful.
         * @exception           E_INVALID_OPERATION     This operation is not allowed.
         * @exception           E_PRIVILEGE_DENIED      The application does not have the privilege to call this method.
+        * @exception     E_UNSUPPORTED_OPERATION       The specified @c netPreference is not supported by this device. @b Since: @b 2.1
         * @remarks                     This preference is not changed during the application life-cycle.
         *                                      If this method is not used, the default connection works in the Wi-Fi first mode.
         * @endif

diff --git a/inc/FNetNetConnectionManager.h b/inc/FNetNetConnectionManager.h
index c00998c..967bce8 100755 (executable)
--- a/inc/FNetNetConnectionManager.h
+++ b/inc/FNetNetConnectionManager.h
@@ -130,6 +130,7 @@ public:
         * @exception   E_SUCCESS                       The method is successful.
         * @exception   E_INVALID_OPERATION     This operation is not allowed.
         * @exception   E_PRIVILEGE_DENIED      The application does not have the privilege to call this method.
+        * @exception     E_UNSUPPORTED_OPERATION       The specified @c netPreference is not supported by this device. @b Since: @b 2.1
         * @remarks             If this method is not used, the default connection works in the Wi-Fi first mode.
         */
        result SetNetPreference(NetPreferenceType netPreference);

diff --git a/inc/FNetNetStatistics.h b/inc/FNetNetStatistics.h
index eb41244..cb7e3b1 100755 (executable)
--- a/inc/FNetNetStatistics.h
+++ b/inc/FNetNetStatistics.h
@@ -94,6 +94,7 @@ public:
         * @exception   E_SUCCESS                       The method is successful.
         * @exception   E_INVALID_ARG           A specified input parameter is invalid.
         * @exception   E_PRIVILEGE_DENIED      The application does not have the privilege to call this method.
+        * @exception     E_UNSUPPORTED_OPERATION       The specified @c bearerType is not supported by this device. @b Since: @b 2.1
         * @remarks             The specific error code can be accessed using the GetLastResult() method.
         */
        long long GetNetStatisticsInfo(NetBearerType bearerType, NetStatisticsInfoType netStatType) const;
@@ -113,6 +114,7 @@ public:
         * @exception   E_INVALID_ARG           A specified input parameter is invalid.
         * @exception   E_SYSTEM                        An internal error has occurred.
         * @exception   E_PRIVILEGE_DENIED      The application does not have the privilege to call this method.
+        * @exception     E_UNSUPPORTED_OPERATION       The specified @c bearerType is not supported by this device. @b Since: @b 2.1
         * @remarks             This method must use warning pop-up for user notification.
         * @see                 GetNetStatisticsInfo()
         */
@@ -132,7 +134,7 @@ public:
         * @exception   E_INVALID_ARG           The specified input parameter is invalid.
         * @exception   E_SYSTEM                        An internal error has occurred.
         * @exception   E_PRIVILEGE_DENIED      The application does not have the privilege to call this method.
-        *
+        * @exception     E_UNSUPPORTED_OPERATION       The specified @c bearerType is not supported by this device. @b Since: @b 2.1
         * @remarks             This method must use warning pop-up for user notification.
         * @see                 GetNetStatisticsInfo()
         */