From 21d2b1ea2f1dff63fb9314d85aa8078057d90e7c Mon Sep 17 00:00:00 2001 From: Steve Block Date: Thu, 5 Jan 2012 23:28:07 +0000 Subject: Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF) DO NOT MERGE See https://android-git.corp.google.com/g/157065 Bug: 5449033 Change-Id: I6d2e59149c2f007d6ba8f1d2990837a37f712ffe --- libcamera/SecCamera.cpp | 8 ++++---- libcamera/SecCameraHWInterface.cpp | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'libcamera') diff --git a/libcamera/SecCamera.cpp b/libcamera/SecCamera.cpp index cdf71ae..fd1b9ac 100755 --- a/libcamera/SecCamera.cpp +++ b/libcamera/SecCamera.cpp @@ -798,7 +798,7 @@ int SecCamera::stopPreview(void) ALOGV("%s :", __func__); if (m_flag_camera_start == 0) { - LOGW("%s: doing nothing because m_flag_camera_start is zero", __func__); + ALOGW("%s: doing nothing because m_flag_camera_start is zero", __func__); return 0; } @@ -882,7 +882,7 @@ int SecCamera::stopRecord(void) ALOGV("%s :", __func__); if (m_flag_record_start == 0) { - LOGW("%s: doing nothing because m_flag_record_start is zero", __func__); + ALOGW("%s: doing nothing because m_flag_record_start is zero", __func__); return 0; } @@ -1088,7 +1088,7 @@ int SecCamera::setSnapshotCmd(void) if (m_flag_camera_start > 0) { LOG_TIME_START(0) - LOGW("WARN(%s):Camera was in preview, should have been stopped\n", __func__); + ALOGW("WARN(%s):Camera was in preview, should have been stopped\n", __func__); stopPreview(); LOG_TIME_END(0) } @@ -1308,7 +1308,7 @@ int SecCamera::getSnapshotAndJpeg(unsigned char *yuv_buf, unsigned char *jpeg_bu if (m_flag_camera_start > 0) { LOG_TIME_START(0) - LOGW("WARN(%s):Camera was in preview, should have been stopped\n", __func__); + ALOGW("WARN(%s):Camera was in preview, should have been stopped\n", __func__); stopPreview(); LOG_TIME_END(0) } diff --git a/libcamera/SecCameraHWInterface.cpp b/libcamera/SecCameraHWInterface.cpp index 8609918..0efd85d 100755 --- a/libcamera/SecCameraHWInterface.cpp +++ b/libcamera/SecCameraHWInterface.cpp @@ -1701,7 +1701,7 @@ status_t CameraHardwareSec::setParameters(const CameraParameters& params) * on scene mode. don't return an error because it causes CTS failure. */ if (new_frame_rate != mParameters.getPreviewFrameRate()) { - LOGW("WARN(%s): request for preview frame %d not allowed, != %d\n", + ALOGW("WARN(%s): request for preview frame %d not allowed, != %d\n", __func__, new_frame_rate, mParameters.getPreviewFrameRate()); } @@ -1785,7 +1785,7 @@ status_t CameraHardwareSec::setParameters(const CameraParameters& params) if (new_scene_mode_str && current_scene_mode_str) { if (!strcmp(new_scene_mode_str, current_scene_mode_str)) { if ((new_min_fps != current_min_fps) || (new_max_fps != current_max_fps)) { - LOGW("%s : requested new_min_fps = %d, new_max_fps = %d not allowed", + ALOGW("%s : requested new_min_fps = %d, new_max_fps = %d not allowed", __func__, new_min_fps, new_max_fps); LOGE("%s : current_min_fps = %d, current_max_fps = %d", __func__, current_min_fps, current_max_fps); -- cgit v1.1