Merge "Fix duplicated alarms." into tizen_2.2

[platform/framework/native/appfw.git] / inc / FSysSettingInfo.h

diff --git a/inc/FSysSettingInfo.h b/inc/FSysSettingInfo.h
index ab8bdd1..54b7973 100644 (file)
--- a/inc/FSysSettingInfo.h
+++ b/inc/FSysSettingInfo.h
@@ -1,5 +1,4 @@
 //
-// Open Service Platform
 // Copyright (c) 2012 Samsung Electronics Co., Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the License);
@@ -355,7 +354,8 @@ public:
         * @since 2.0
         *
         * @privlevel   platform
-        * @privilege   %http://tizen.org/privilege/systemsetting.read
+        * @privilege   %http://tizen.org/privilege/settingmanager.read @n
+        *              (%http://tizen.org/privilege/systemsetting.read is deprecated.)
         *
         * @return      An error code
         * @param[in]   key     The <a href="../org.tizen.native.appprogramming/html/guide/system/settings_info.htm">key name</a> of the setting information
@@ -374,7 +374,8 @@ public:
         * @since 2.0
         *
         * @privlevel   platform
-        * @privilege   %http://tizen.org/privilege/systemsetting.write
+        * @privilege   %http://tizen.org/privilege/settingmanager.write @n
+        *              (%http://tizen.org/privilege/systemsetting.write is deprecated.)
         *
         * @return      An error code
         * @param[in]   key     The <a href="../org.tizen.native.appprogramming/html/guide/system/settings_info.htm">key name</a> of the setting information
@@ -393,7 +394,8 @@ public:
         *
         * @since 2.0
         * @privlevel   platform
-        * @privilege   %http://tizen.org/privilege/systemsetting.write
+        * @privilege   %http://tizen.org/privilege/settingmanager.write @n
+        *              (%http://tizen.org/privilege/systemsetting.write is deprecated.)
         *
         * @return      An error code
         * @param[in]   key                     The <a href="../org.tizen.native.appprogramming/html/guide/system/settings_info.htm">key name</a> of the setting information
@@ -405,12 +407,16 @@ public:
         * @exception   E_OBJ_NOT_FOUND         The specified @c key is not found.
         * @exception   E_UNSUPPORTED_OPERATION The specified @c key is existed, However it is not supported by this device.
         * @exception   E_IN_PROGRESS           The specified key is under processing or invalid state.
-        * @exception   E_SYSTEM                The method cannot proceed due to a severe system error.
+        * @exception   E_SYSTEM                Either of the following conditions has occured:
+        *                                      - The method cannot proceed due to a severe system error.
+        *                                      - This error can occur and Wi-Fi Direct™ is not activated if the @c key is %http://tizen.org/setting/network.wifi.direct and Wi-Fi is activated.-
+Direct™ is not activated if the @c key is %http://tizen.org/setting/network.wifi.direct and Wi-Fi is activated.
+
         */
        static result SetValueAsyncForPrivilegedKey(const Tizen::Base::String& key, bool value, ISettingInfoSetValueAsyncResultListener* listener);
 
        /**
-        * Sets the specific @c bool type sett   * @exception   E_IN_PROGRESS           The specified key is under processing or invalid state.ing information based on the specified designators (key) asynchronously.
+        * Sets the specific @c bool type setting information based on the specified designators (key) asynchronously.
         *
         * @since 2.0
         * @privlevel   platform
@@ -437,7 +443,8 @@ public:
         * @since 2.0
         *
         * @privlevel   platform
-        * @privilege   %http://tizen.org/privilege/systemsetting.write
+        * @privilege   %http://tizen.org/privilege/settingmanager.write @n
+        *              (%http://tizen.org/privilege/systemsetting.write is deprecated.)
         *
         * @return      An error code
         * @param[in]   key                     The <a href="../org.tizen.native.appprogramming/html/guide/system/settings_info.htm">key name</a> of the setting information
@@ -458,7 +465,8 @@ public:
         * @since 2.0
         *
         * @privlevel   platform
-        * @privilege   %http://tizen.org/privilege/systemsetting.write
+        * @privilege   %http://tizen.org/privilege/settingmanager.write @n
+        *              (%http://tizen.org/privilege/systemsetting.write is deprecated.)
         *
         * @return      An error code
         * @exception   E_SUCCESS               The method is successful.