Check camera feature with system info

[Version] 0.2.76
[Profile] Common
[Issue Type] Update
[Dependency module] mmsvc-core

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

diff --git a/muse/src/muse_camera_dispatcher.c b/muse/src/muse_camera_dispatcher.c
index 9aeb86964ac0df2e4b2380a0214cfc7bed56ac04..803efc9d1b34a0c8a5cdf5b1082acdff81f4b6f8 100644 (file)
--- a/muse/src/muse_camera_dispatcher.c
+++ b/muse/src/muse_camera_dispatcher.c
@@ -34,6 +34,7 @@
 #define LOG_TAG "MUSED_CAMERA"
 #define KEY_LENGTH 24
 
+#define CAMERA_FEATURE_NAME   "http://tizen.org/feature/camera"
 #define CAMERA_PRIVILEGE_NAME "http://tizen.org/privilege/camera"
 #define MUSED_KEY_DEVICE_STATE_CHECK  "camera_get_device_state_is_called"
 #define MUSED_KEY_DEVICE_STATE_RETURN "camera_get_device_state_return"
@@ -1370,6 +1371,7 @@ int camera_dispatcher_create(muse_module_h module)
        int device_type;
        int client_fd = -1;
        int pid = 0;
+       bool camera_feature_supported = false;
        void *gdbus_connection = NULL;
        muse_camera_handle_s *muse_camera = NULL;
        muse_camera_api_e api = MUSE_CAMERA_API_CREATE;
@@ -1426,6 +1428,16 @@ int camera_dispatcher_create(muse_module_h module)
        g_cond_init(&muse_camera->task_cond);
        g_queue_init(&muse_camera->task_queue);
 
+       /* camera feature support check */
+       if (muse_core_get_platform_info(CAMERA_FEATURE_NAME, &camera_feature_supported) != MM_ERROR_NONE)
+               LOGE("failed to get platform info for camera support");
+
+       if (!camera_feature_supported) {
+               LOGE("CAMERA NOT SUPPORTED, BUT INI FILE FOR CMAERA IS EXISTED. RECOMMEND TO REMOVE IT.");
+               ret = CAMERA_ERROR_NOT_SUPPORTED;
+               goto _CREATE_ERROR;
+       }
+
        muse_camera->task_run = true;
        muse_camera->task_thread = g_thread_try_new("camera_task_thread",
                _camera_dispatcher_task_func, (gpointer)muse_camera, NULL);

diff --git a/packaging/mmsvc-camera.spec b/packaging/mmsvc-camera.spec
index 6bc21d9dd383dc85e2c297b85318b89ea8a8a343..80eeb179e1ee3c91d50555b18feb83cecec4de44 100644 (file)
--- a/packaging/mmsvc-camera.spec
+++ b/packaging/mmsvc-camera.spec
@@ -1,7 +1,7 @@
 Name:       mmsvc-camera
 Summary:    A Camera module for muse server
-Version:    0.2.75
-Release:    1
+Version:    0.2.76
+Release:    0
 Group:      Multimedia/Libraries
 License:    Apache-2.0
 Source0:    %{name}-%{version}.tar.gz