merge with master

[framework/osp/net.git] / inc / FNetWifiWifiManager.h

diff --git a/inc/FNetWifiWifiManager.h b/inc/FNetWifiWifiManager.h
index 7736101..5541f2e 100755 (executable)
--- a/inc/FNetWifiWifiManager.h
+++ b/inc/FNetWifiWifiManager.h
@@ -134,7 +134,8 @@ public:
      * Activates the local Wi-Fi device.
      *
      * @since       2.0
-     * @privilege   %http://tizen.org/privilege/wifi.admin
+     * @privlevel   public
+     * @privilege   http://tizen.org/privilege/wifi.admin
      *
      * @return      An error code
      * @exception   E_SUCCESS           The activation is successful.
@@ -152,7 +153,8 @@ public:
      * Deactivates the local Wi-Fi device.
      *
      * @since       2.0
-     * @privilege   %http://tizen.org/privilege/wifi.admin
+     * @privlevel   public
+     * @privilege   http://tizen.org/privilege/wifi.admin
      *
      * @return      An error code
      * @exception   E_SUCCESS           The deactivation is successful.
@@ -209,7 +211,8 @@ public:
      * Scans for a nearby BSS with both the infrastructure and independent modes.
      *
      * @since       2.0
-     * @privilege   %http://tizen.org/privilege/wifi.read
+     * @privlevel   public
+     * @privilege   http://tizen.org/privilege/wifi.read
      *
      * @return      An error code
      * @exception   E_SUCCESS           The method is successful.
@@ -226,7 +229,8 @@ public:
      * Connects to a specific access point that is a BSS with an infrastructure mode.
      *
      * @since       2.0
-     * @privilege   %http://tizen.org/privilege/wifi.admin
+     * @privlevel   public
+     * @privilege   http://tizen.org/privilege/wifi.admin
      *
      * @return      An error code
      * @param[in]   targetApInfo        A BSS information representing the target access point
@@ -244,12 +248,11 @@ public:
     result Connect(const WifiBssInfo& targetApInfo);
 
     /**
-     * @if VISPARTNER-MANUFACTURER
      * Sets the behavior mode of the Wi-Fi background system about connection and background scanning.
      *
      * @since       2.0
-     * @visibility  partner-manufacturer
-     * @privilege   %http://tizen.org/privilege/wifimanager
+     * @privlevel   platform
+     * @privilege   http://tizen.org/privilege/wifimanager
      *
      * @return      An error code
      * @param[in]   mode                A Wi-Fi background system mode
@@ -257,18 +260,16 @@ public:
      * @exception   E_PRIVILEGE_DENIED  The application does not have the privilege to call this method.
      * @exception   E_OPERATION_FAILED  The operation has failed.
      * @exception   E_SYSTEM            The method cannot proceed due to a severe system error.
-     * @endif
      */
     result SetWifiSystemScanMode(WifiSystemScanMode mode);
 
     /**
-     * @if VISPARTNER-MANUFACTURER
      * Adds the specified listener for receiving the notification when the state of current Wi-Fi connection is changed
      * or the result of Wi-Fi background scanning is updated
      *
      * @since       2.0
-     * @visibility  partner-manufacturer
-     * @privilege   %http://tizen.org/privilege/wifimanager
+     * @privlevel   platform
+     * @privilege   http://tizen.org/privilege/wifimanager
      *
      * @return      An error code
      * @param[in]   listener            The listener to add
@@ -276,18 +277,16 @@ public:
      * @exception   E_OBJ_ALREADY_EXIST The listener is already added.
      * @exception   E_PRIVILEGE_DENIED  The application does not have the privilege to call this method.
      * @exception   E_SYSTEM            The method cannot proceed due to a severe system error.
-     * @endif
      */
     result AddSystemMonitoringEventListener(IWifiSystemMonitoringEventListener& listener);
 
     /**
-     * @if VISPARTNER-MANUFACTURER
      * Removes the specified IWifiSystemMonitoringEventListener instance for receiving the notification. The removed listener
      * cannot listen to the events that are fired.
      *
      * @since 2.0
-     * @visibility  partner-manufacturer
-     * @privilege   %http://tizen.org/privilege/wifimanager
+     * @privlevel   platform
+     * @privilege   http://tizen.org/privilege/wifimanager
      *
      * @return      An error code
      * @param[in]   listener            The listener to remove
@@ -295,42 +294,34 @@ public:
      * @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_SYSTEM            The method cannot proceed due to a severe system error.
-     * @endif
      */
     result RemoveSystemMonitoringEventListener(IWifiSystemMonitoringEventListener& listener);
 
     /**
-     * @if VISPARTNER-MANUFACTURER
      * Gets the state of current Wi-Fi connection.
      *
      * @since 2.0
-     * @visibility  partner-manufacturer
      *
      * @return      The state of the current Wi-Fi connection
-     * @endif
      */
     WifiConnectionState GetConnectionState(void) const;
 
     /**
-     * @if VISPARTNER-MANUFACTURER
      * Gets the information of current Wi-Fi connection target which the local device is connecting or connected with.
      *
      * @since 2.0
-     * @visibility  partner-manufacturer
      *
      * @return      A pointer to the WifiBssInfo instance representing the information of current Wi-Fi connection target
      *              else @c null if GetConnectionState() is WIFI_CONN_STATE_NOT_CONNECTED
-     * @endif
      */
     WifiBssInfo* GetConnectionTargetInfoN(void) const;
 
     /**
-     * @if VISPARTNER-MANUFACTURER
      * Updates the Wi-Fi BSS information which is saved in the underlying Wi-Fi system.
      *
      * @since 2.0
-     * @visibility  partner-manufacturer
-     * @privilege   %http://tizen.org/privilege/wifimanager
+     * @privlevel   platform
+     * @privilege   http://tizen.org/privilege/wifimanager
      *
      * @return      An error code
      * @param[in]   bssInfo             A BSS information representing the access point
@@ -339,20 +330,18 @@ public:
      * @exception   E_OBJ_NOT_FOUND     The specified input parameter is not found.
      * @exception   E_OPERATION_FAILED  The operation has failed.
      * @exception   E_SYSTEM            The method cannot proceed due to a severe system error.
-     * @endif
+     *
+     * @remarks The updated information is deleted when Wi-Fi is turned off if the BSS has never been connected before.
      */
     result UpdateBssInfo(const WifiBssInfo& bssInfo);
 
     /**
-     * @if VISPARTNER-MANUFACTURER
      * Gets a list of the latest search results which the underlying Wi-Fi system scan periodically on background.
      *
      * @since 2.0
-     * @visibility  partner-manufacturer
      *
      * @return      An IList containing WifiBssInfo of existing Wi-Fi connections if successful, @n
      *              else @c null
-     * @endif
      */
     Tizen::Base::Collection::IList* GetSystemScanResultN(void) const;