summaryrefslogtreecommitdiffstats
path: root/services/camera/libcameraservice/device3
diff options
context:
space:
mode:
authorEino-Ville Talvala <etalvala@google.com>2013-10-11 19:21:51 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2013-10-11 19:21:51 +0000
commit1dd08b30e2366cabc50d883885d6229dab8218f2 (patch)
tree9939b56d22eea0e02b14f7274f098bc6cfbea425 /services/camera/libcameraservice/device3
parentcc27e117ed01c9a2b4def5a9c7a3103af83ee47e (diff)
parent2b07e0207da44d7b3cc63c369fd10c9f12a5e2cd (diff)
downloadframeworks_av-1dd08b30e2366cabc50d883885d6229dab8218f2.zip
frameworks_av-1dd08b30e2366cabc50d883885d6229dab8218f2.tar.gz
frameworks_av-1dd08b30e2366cabc50d883885d6229dab8218f2.tar.bz2
Merge "Camera2/3: Add more tracing for API1" into klp-dev
Diffstat (limited to 'services/camera/libcameraservice/device3')
-rw-r--r--services/camera/libcameraservice/device3/Camera3Device.cpp1
1 files changed, 0 insertions, 1 deletions
diff --git a/services/camera/libcameraservice/device3/Camera3Device.cpp b/services/camera/libcameraservice/device3/Camera3Device.cpp
index 81bbeee..6f2dc85 100644
--- a/services/camera/libcameraservice/device3/Camera3Device.cpp
+++ b/services/camera/libcameraservice/device3/Camera3Device.cpp
@@ -999,7 +999,6 @@ bool Camera3Device::willNotify3A() {
}
status_t Camera3Device::waitForNextFrame(nsecs_t timeout) {
- ATRACE_CALL();
status_t res;
Mutex::Autolock l(mOutputLock);