Add resource conflict error in error convert function

[Version] 0.2.66
[Profile] Common
[Issue Type] Update
[Dependency module] N/A
[Test] [M(T) - Boot=(OK), sdb=(OK), Home=(OK), Touch=(OK), Version=tizen-3.0-mobile_20170104.1]

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

diff --git a/legacy/src/legacy_camera.c b/legacy/src/legacy_camera.c
index 0c942ffee7b2efed7f90147879354809071ad4d6..2add167cb78efd2bd223405be043b8e64e3641c3 100644 (file)
--- a/legacy/src/legacy_camera.c
+++ b/legacy/src/legacy_camera.c
@@ -145,6 +145,10 @@ int __convert_camera_error_code(const char *func, int code)
                ret = CAMERA_ERROR_NOT_SUPPORTED;
                errorstr = "ERROR_NOT_SUPPORTED";
                break;
+       case MM_ERROR_RESOURCE_INTERNAL:
+               ret = CAMERA_ERROR_RESOURCE_CONFLICT;
+               errorstr = "ERROR_RESOURCE_CONFLICT";
+               break;
        default:
                ret = CAMERA_ERROR_INVALID_OPERATION;
                errorstr = "INVALID_OPERATION";

diff --git a/packaging/mmsvc-camera.spec b/packaging/mmsvc-camera.spec
index 48216e232fa06e2927fd6976a863acfad443a2aa..6dbf7e9a6675f61281559a5e590340fa5442f3bd 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.2.65
+Version:    0.2.66
 Release:    0
 Group:      Multimedia/Libraries
 License:    Apache-2.0