From: Jeongmo Yang Date: Thu, 18 May 2017 12:09:58 +0000 (+0900) Subject: Update code for privilege change X-Git-Tag: submit/tizen/20170612.030116^0 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=2543d8cbaa4dcfd802b410b9f5345fc8e3b957e2;p=platform%2Fcore%2Fapi%2Fcamera.git Update code for privilege change camera privilege is removed from camera_create and it will be checked in camera_start_preview API. So, camera_start_preview could not be returned until get user's response. [Version] 0.3.1 [Profile] Common [Issue Type] Update [Dependency module] N/A Change-Id: Ic0409fdb46315a20ed78165b7080dd016a42b367 Signed-off-by: Jeongmo Yang --- diff --git a/packaging/capi-media-camera.spec b/packaging/capi-media-camera.spec index 2a3b0e4..51b0ac8 100644 --- a/packaging/capi-media-camera.spec +++ b/packaging/capi-media-camera.spec @@ -1,6 +1,6 @@ Name: capi-media-camera Summary: A Camera API -Version: 0.3.0 +Version: 0.3.1 Release: 0 Group: Multimedia/API License: Apache-2.0 diff --git a/src/camera.c b/src/camera.c index 4e83dec..6b999f6 100644 --- a/src/camera.c +++ b/src/camera.c @@ -2560,7 +2560,7 @@ int camera_create(camera_device_e device, camera_h *camera) LOGD("cb info : %d", pc->cb_info->fd); - ret = _camera_client_wait_for_cb_return(api, pc->cb_info, CAMERA_CB_NO_TIMEOUT); + ret = _camera_client_wait_for_cb_return(api, pc->cb_info, CAMERA_CB_TIMEOUT); pc->cb_info->api_waiting[MUSE_CAMERA_API_CREATE] = 0; @@ -2689,7 +2689,7 @@ int camera_start_preview(camera_h camera) LOGD("Enter"); - _camera_msg_send(api, pc->cb_info, &ret, CAMERA_CB_TIMEOUT); + _camera_msg_send(api, pc->cb_info, &ret, CAMERA_CB_NO_TIMEOUT); if (ret == CAMERA_ERROR_NONE && CHECK_PREVIEW_CB(pc->cb_info, PREVIEW_CB_TYPE_EVAS)) { ret = _camera_start_evas_rendering(camera); if (ret != CAMERA_ERROR_NONE) {