Remove unused code related with sound policy

[Version] 0.3.17
[Profile] Common
[Issue Type] Update
[Dependency module] N/A

Change-Id: I98339ab732d3aeb5bfea8b27078fc47bdf99dc34
Signed-off-by: Jeongmo Yang <jm80.yang@samsung.com>

diff --git a/legacy/include/legacy_camera.h b/legacy/include/legacy_camera.h
index 6b0caf5..7972364 100644 (file)
--- a/legacy/include/legacy_camera.h
+++ b/legacy/include/legacy_camera.h
@@ -48,12 +48,9 @@ typedef enum {
        CAMERA_ERROR_OUT_OF_MEMORY          = TIZEN_ERROR_OUT_OF_MEMORY,            /**< Out of memory */
        CAMERA_ERROR_DEVICE                 = CAMERA_ERROR_CLASS | 0x04,            /**< Device error */
        CAMERA_ERROR_INVALID_OPERATION      = TIZEN_ERROR_INVALID_OPERATION,        /**< Internal error */
-       CAMERA_ERROR_SOUND_POLICY           = CAMERA_ERROR_CLASS | 0x06,            /**< Blocked by Audio Session Manager (Deprecated since 3.0) */
        CAMERA_ERROR_SECURITY_RESTRICTED    = CAMERA_ERROR_CLASS | 0x07,            /**< Restricted by security system policy */
        CAMERA_ERROR_DEVICE_BUSY            = CAMERA_ERROR_CLASS | 0x08,            /**< The device is using another application or working on some operation */
        CAMERA_ERROR_DEVICE_NOT_FOUND       = CAMERA_ERROR_CLASS | 0x09,            /**< No camera device */
-       CAMERA_ERROR_SOUND_POLICY_BY_CALL   = CAMERA_ERROR_CLASS | 0x0a,            /**< Blocked by Audio Session Manager - CALL (Deprecated since 3.0) */
-       CAMERA_ERROR_SOUND_POLICY_BY_ALARM  = CAMERA_ERROR_CLASS | 0x0b,            /**< Blocked by Audio Session Manager - ALARM (Deprecated since 3.0) */
        CAMERA_ERROR_ESD                    = CAMERA_ERROR_CLASS | 0x0c,            /**< ESD situation */
        CAMERA_ERROR_PERMISSION_DENIED      = TIZEN_ERROR_PERMISSION_DENIED,        /**< The access to the resources can not be granted*/
        CAMERA_ERROR_NOT_SUPPORTED          = TIZEN_ERROR_NOT_SUPPORTED,            /**< The feature is not supported */
@@ -139,9 +136,6 @@ typedef enum {
  */
 typedef enum {
        CAMERA_POLICY_NONE = 0,         /**< None */
-       CAMERA_POLICY_SOUND,            /**< Sound policy (Deprecated since 3.0) */
-       CAMERA_POLICY_SOUND_BY_CALL,    /**< Sound policy by CALL (Deprecated since 3.0) */
-       CAMERA_POLICY_SOUND_BY_ALARM,   /**< Sound policy by ALARM (Deprecated since 3.0) */
        CAMERA_POLICY_SECURITY,         /**< Security policy */
        CAMERA_POLICY_RESOURCE_CONFLICT /**< Resource conflict (Since 3.0) */
 } camera_policy_e;
@@ -738,7 +732,6 @@ typedef bool (*camera_supported_preview_format_cb)(camera_pixel_format_e format,
  * @retval #CAMERA_ERROR_NONE Successful
  * @retval #CAMERA_ERROR_INVALID_PARAMETER Invalid parameter
  * @retval #CAMERA_ERROR_OUT_OF_MEMORY Out of memory
- * @retval #CAMERA_ERROR_SOUND_POLICY Sound policy error
  * @retval #CAMERA_ERROR_INVALID_OPERATION Invalid operation
  * @retval #CAMERA_ERROR_PERMISSION_DENIED The access to the resources can not be granted
  * @retval #CAMERA_ERROR_NOT_SUPPORTED The feature is not supported
@@ -800,7 +793,6 @@ int legacy_camera_destroy(camera_h camera);
  * @retval #CAMERA_ERROR_NONE Successful
  * @retval #CAMERA_ERROR_INVALID_PARAMETER Invalid parameter
  * @retval #CAMERA_ERROR_INVALID_STATE Invalid state
- * @retval #CAMERA_ERROR_SOUND_POLICY Sound policy error
  * @retval #CAMERA_ERROR_RESOURCE_CONFLICT Resource conflict error
  * @retval #CAMERA_ERROR_INVALID_OPERATION Invalid operation
  * @retval #CAMERA_ERROR_DEVICE_BUSY The device is being used in another application or is performing other operations

diff --git a/legacy/src/legacy_camera.c b/legacy/src/legacy_camera.c
index 6fb8f5d..b86e3e3 100644 (file)
--- a/legacy/src/legacy_camera.c
+++ b/legacy/src/legacy_camera.c
@@ -105,18 +105,6 @@ int __convert_camera_error_code(const char *func, int code)
                ret = CAMERA_ERROR_OUT_OF_MEMORY;
                errorstr = "OUT_OF_MEMORY";
                break;
-       case MM_ERROR_POLICY_BLOCKED:
-               ret = CAMERA_ERROR_SOUND_POLICY;
-               errorstr = "ERROR_SOUND_POLICY";
-               break;
-       case MM_ERROR_POLICY_BLOCKED_BY_CALL:
-               ret = CAMERA_ERROR_SOUND_POLICY_BY_CALL;
-               errorstr = "ERROR_SOUND_POLICY_BY_CALL";
-               break;
-       case MM_ERROR_POLICY_BLOCKED_BY_ALARM:
-               ret = CAMERA_ERROR_SOUND_POLICY_BY_ALARM;
-               errorstr = "ERROR_SOUND_POLICY_BY_ALARM";
-               break;
        case MM_ERROR_POLICY_RESTRICTED:
                ret = CAMERA_ERROR_SECURITY_RESTRICTED;
                errorstr = "ERROR_RESTRICTED";

diff --git a/packaging/mmsvc-camera.spec b/packaging/mmsvc-camera.spec
index d9edad7..67a091b 100644 (file)
--- a/packaging/mmsvc-camera.spec
+++ b/packaging/mmsvc-camera.spec
@@ -1,6 +1,6 @@
 Name:       mmsvc-camera
 Summary:    A Camera module for muse server
-Version:    0.3.16
+Version:    0.3.17
 Release:    0
 Group:      Multimedia/Libraries
 License:    Apache-2.0