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/Stream.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/Stream.cpp')
| -rw-r--r-- | modules/camera/Stream.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/modules/camera/Stream.cpp b/modules/camera/Stream.cpp index aae7adb..9c5c5b5 100644 --- a/modules/camera/Stream.cpp +++ b/modules/camera/Stream.cpp @@ -24,8 +24,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 "Stream.h" @@ -139,7 +138,7 @@ bool Stream::isValidReuseStream(int id, camera3_stream_t *s) int Stream::registerBuffers(const camera3_stream_buffer_set_t *buf_set) { - CAMTRACE_CALL(); + ATRACE_CALL(); if (buf_set->stream != mStream) { ALOGE("%s:%d: Buffer set for invalid stream. Got %p expect %p", |