Release version 0.2.14 09/51909/1
authorManish Sogi <manish.sogi@samsung.com>
Tue, 17 Nov 2015 07:29:51 +0000 (12:59 +0530)
committerManish Sogi <manish.sogi@samsung.com>
Tue, 17 Nov 2015 07:29:51 +0000 (12:59 +0530)
1. Handled new message MM_MESSAGE_CAMCORDER_STATE_CHANGED_BY_RM in message callback

Change-Id: I7d9a865aec2accd9981b2bcae1ef13938f702b58
Signed-off-by: Manish Sogi <manish.sogi@samsung.com>
legacy/src/legacy_camera.c
packaging/mmsvc-camera.spec

index 48a88d8..d994187 100755 (executable)
@@ -352,6 +352,7 @@ static int __mm_camera_message_callback(int message, void *param, void *user_dat
        case MM_MESSAGE_CAMCORDER_STATE_CHANGED:
        case MM_MESSAGE_CAMCORDER_STATE_CHANGED_BY_ASM:
        case MM_MESSAGE_CAMCORDER_STATE_CHANGED_BY_SECURITY:
+       case MM_MESSAGE_CAMCORDER_STATE_CHANGED_BY_RM:
                if (message == MM_MESSAGE_CAMCORDER_STATE_CHANGED &&
                    (m->state.previous < MM_CAMCORDER_STATE_NONE ||
                     m->state.previous > MM_CAMCORDER_STATE_PAUSED ||
@@ -383,6 +384,9 @@ static int __mm_camera_message_callback(int message, void *param, void *user_dat
                } else if (message == MM_MESSAGE_CAMCORDER_STATE_CHANGED_BY_SECURITY) {
                        policy = CAMERA_POLICY_SECURITY;
                        LOGW("CAMERA_POLICY_SECURITY");
+               } else if (message == MM_MESSAGE_CAMCORDER_STATE_CHANGED_BY_RM) {
+                       policy = CAMERA_POLICY_RESOURCE_CONFLICT;
+                       LOGW("CAMERA_POLICY_RESOURCE_CONFLICT");
                }
 
                if (previous_state != handle->state && handle->user_cb[_CAMERA_EVENT_TYPE_STATE_CHANGE]) {
index 6142ec7..054995a 100644 (file)
@@ -3,7 +3,7 @@
 
 Name:       mmsvc-camera
 Summary:    A Camera module for muse server
-Version:    0.2.13
+Version:    0.2.14
 Release:    0
 Group:      Multimedia/Libraries
 License:    Apache-2.0