diff options
author | Alex Ray <aray@google.com> | 2013-10-14 15:56:43 -0700 |
---|---|---|
committer | Alex Ray <aray@google.com> | 2013-10-14 15:56:43 -0700 |
commit | ea80382be17ab288622506475b8f15d9d8ebee80 (patch) | |
tree | 39ec2a4f1c42749c8948a75c12d2087c9b27a5d3 /modules/camera/Camera.cpp | |
parent | 13a47c595031ed926e8258945a08bfa96fdf9408 (diff) | |
download | hardware_libhardware-ea80382be17ab288622506475b8f15d9d8ebee80.zip hardware_libhardware-ea80382be17ab288622506475b8f15d9d8ebee80.tar.gz hardware_libhardware-ea80382be17ab288622506475b8f15d9d8ebee80.tar.bz2 |
modules: camera: Update trace headers to libutils
Now that libutils is outside of frameworks, use that for c++-style
scoped tracing and remove the temporary shim header.
Change-Id: I913767aed8ff70abb9299e7a7b318b24a25e23c1
Diffstat (limited to 'modules/camera/Camera.cpp')
-rw-r--r-- | modules/camera/Camera.cpp | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/modules/camera/Camera.cpp b/modules/camera/Camera.cpp index 973380e..724f861 100644 --- a/modules/camera/Camera.cpp +++ b/modules/camera/Camera.cpp @@ -29,8 +29,7 @@ #include <cutils/log.h> #define ATRACE_TAG (ATRACE_TAG_CAMERA | ATRACE_TAG_HAL) -#include <cutils/trace.h> -#include "ScopedTrace.h" +#include <utils/Trace.h> #include "Camera.h" @@ -79,7 +78,7 @@ Camera::~Camera() int Camera::open(const hw_module_t *module, hw_device_t **device) { ALOGI("%s:%d: Opening camera device", __func__, mId); - CAMTRACE_CALL(); + ATRACE_CALL(); pthread_mutex_lock(&mMutex); if (mBusy) { pthread_mutex_unlock(&mMutex); @@ -116,7 +115,7 @@ int Camera::getInfo(struct camera_info *info) int Camera::close() { ALOGI("%s:%d: Closing camera device", __func__, mId); - CAMTRACE_CALL(); + ATRACE_CALL(); pthread_mutex_lock(&mMutex); if (!mBusy) { pthread_mutex_unlock(&mMutex); @@ -300,7 +299,7 @@ int Camera::configureStreams(camera3_stream_configuration_t *stream_config) camera3_stream_t *astream; Stream **newStreams = NULL; - CAMTRACE_CALL(); + ATRACE_CALL(); ALOGV("%s:%d: stream_config=%p", __func__, mId, stream_config); if (stream_config == NULL) { @@ -485,7 +484,7 @@ int Camera::processCaptureRequest(camera3_capture_request_t *request) camera3_capture_result result; ALOGV("%s:%d: request=%p", __func__, mId, request); - CAMTRACE_CALL(); + ATRACE_CALL(); if (request == NULL) { ALOGE("%s:%d: NULL request recieved", __func__, mId); |