commit ea80382be17ab288622506475b8f15d9d8ebee80
author Alex Ray <aray@google.com> Mon Oct 14 15:56:43 2013 -0700
committer Alex Ray <aray@google.com> Mon Oct 14 15:56:43 2013 -0700
tree 39ec2a4f1c42749c8948a75c12d2087c9b27a5d3
parent 13a47c595031ed926e8258945a08bfa96fdf9408

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

modules/camera/Stream.cpp

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 @@
 
 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",