Fix public header issue

- device-policy-manager.h : remark -> remarks
- zone.h : dpm_zone_foreach_name -> dpm_zone_foreach_name()
- remove unapproved api in restriction.h (add to usb.h)
	- dpm_restriction_set_usb_client_state()
	- dpm_restriction_get_usb_client_state()

Change-Id: I665c33948526f1fcc0396a0b4d55e0a2e35ca193
Signed-off-by: yeji kim <yeji01.kim@samsung.com>

diff --git a/libs/CMakeLists.txt b/libs/CMakeLists.txt
index ec007b1..58a48cb 100755 (executable)
--- a/libs/CMakeLists.txt
+++ b/libs/CMakeLists.txt
@@ -43,6 +43,7 @@ SET(CAPI              dpm/device-policy-manager.h
                                dpm/password.h
                                dpm/password_internal.h
                                dpm/zone.h
+                               dpm/usb.h
 )
 
 SET (CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,-z,noexecstack")

diff --git a/libs/dpm/device-policy-manager.h b/libs/dpm/device-policy-manager.h
index 774eb84..a75b2e3 100644 (file)
--- a/libs/dpm/device-policy-manager.h
+++ b/libs/dpm/device-policy-manager.h
@@ -127,7 +127,7 @@ int dpm_manager_destroy(device_policy_manager_h handle);
  * @retval      #DPM_ERROR_NONE Successful
  * @retval      #DPM_ERROR_INVALID_PARAMETER Invalid parameter
  * @retval      #DPM_ERROR_TIMED_OUT Time out
- * @remark      See @ref CAPI_SECURITY_DPM_MODULE_POLICY section for available policy name
+ * @remarks     See @ref CAPI_SECURITY_DPM_MODULE_POLICY section for available policy name
  * @pre         The handle must be created by dpm_manager_create().
  * @see         dpm_manager_create()
  * @see         dpm_remove_policy_changed_cb()
@@ -181,7 +181,7 @@ typedef void(*dpm_signal_cb)(const char* name, const char* object, void *user_da
  * @retval      #DPM_ERROR_NONE Successful
  * @retval      #DPM_ERROR_INVALID_PARAMETER Invalid parameter
  * @retval      #DPM_ERROR_TIMED_OUT Time out
- * @remark      See @ref CAPI_DPM_SECURITY_MODULE_SIGNAL section for signals
+ * @remarks     See @ref CAPI_DPM_SECURITY_MODULE_SIGNAL section for signals
  * @pre         The handle must be created by dpm_manager_create().
  * @see         dpm_manager_create()
  * @see         dpm_manager_destroy()

diff --git a/libs/dpm/restriction.h b/libs/dpm/restriction.h
index f4ec259..6505d9a 100644 (file)
--- a/libs/dpm/restriction.h
+++ b/libs/dpm/restriction.h
@@ -685,9 +685,6 @@ int dpm_restriction_set_browser_state(device_policy_manager_h handle, int allow)
  */
 int dpm_restriction_get_browser_state(device_policy_manager_h handle, int *is_allowed);
 
-int dpm_restriction_set_usb_client_state(device_policy_manager_h handle, int allow);
-int dpm_restriction_get_usb_client_state(device_policy_manager_h handle, int *is_allowed);
-
 /**
  * @}
  */

diff --git a/libs/dpm/usb.h b/libs/dpm/usb.h
new file mode 100644 (file)
index 0000000..8e7fd1e
--- /dev/null
+++ b/libs/dpm/usb.h
@@ -0,0 +1,42 @@
+/*
+ *  Copyright (c) 2016 Samsung Electronics Co., Ltd All Rights Reserved
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License
+ */
+
+#ifndef __CAPI_USB_POLICY_H__
+#define __CAPI_USB_POLICY_H__
+
+#include <dpm/device-policy-manager.h>
+
+/**
+ * @file usb.h
+ * @brief This file provides APIs to control usb client
+ */
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+int dpm_restriction_set_usb_client_state(device_policy_manager_h handle, int allow);
+int dpm_restriction_get_usb_client_state(device_policy_manager_h handle, int *is_allowed);
+
+/**
+ * @}
+ */
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+#endif /* __CAPI_USB_POLICY_H__ */

diff --git a/libs/dpm/zone.h b/libs/dpm/zone.h
index e7b56d8..4f9ed41 100644 (file)
--- a/libs/dpm/zone.h
+++ b/libs/dpm/zone.h
@@ -120,7 +120,7 @@ int dpm_zone_get_state(device_policy_manager_h handle, const char* name, dpm_zon
  * @brief       Called to get all the name of created zones.
  * @since_tizen 3.0
  * @param[in]   name The zone name
- * @param[in]   user_data The user data passed from dpm_zone_foreach_name
+ * @param[in]   user_data The user data passed from dpm_zone_foreach_name()
  * @return      true to continue with the next iteration of the loop, otherwise false to break out out the loop
  * @see         dpm_zone_foreach_name()
  */

diff --git a/libs/restriction.cpp b/libs/restriction.cpp
index 3528641..34da644 100644 (file)
--- a/libs/restriction.cpp
+++ b/libs/restriction.cpp
@@ -15,6 +15,7 @@
  */
 
 #include "dpm/restriction.h"
+#include "dpm/usb.h"
 
 #include "debug.h"
 #include "status.h"