summaryrefslogtreecommitdiffstats
path: root/services
diff options
context:
space:
mode:
authorZhijun He <zhijunhe@google.com>2014-05-06 18:37:54 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-05-06 18:37:54 +0000
commit14136039b752376240698e8b422c76de01488bc5 (patch)
tree9aa7593033b5f87a4b8a28e24392188260c36a72 /services
parent7ebe2c64dea42a3fd4de34ccb877d23b7a4e8076 (diff)
parent13c878f07fb36a49aade20cec684ed8e12724751 (diff)
downloadframeworks_av-14136039b752376240698e8b422c76de01488bc5.zip
frameworks_av-14136039b752376240698e8b422c76de01488bc5.tar.gz
frameworks_av-14136039b752376240698e8b422c76de01488bc5.tar.bz2
Merge "Camera3: fix missing string in logging code"
Diffstat (limited to 'services')
-rw-r--r--services/camera/libcameraservice/device3/Camera3Stream.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/services/camera/libcameraservice/device3/Camera3Stream.cpp b/services/camera/libcameraservice/device3/Camera3Stream.cpp
index abfb602..7645a2a 100644
--- a/services/camera/libcameraservice/device3/Camera3Stream.cpp
+++ b/services/camera/libcameraservice/device3/Camera3Stream.cpp
@@ -397,7 +397,7 @@ status_t Camera3Stream::registerBuffersLocked(camera3_device *hal3Device) {
"must be set to NULL in camera3_device::ops", __FUNCTION__);
return INVALID_OPERATION;
} else {
- ALOGD("%s: Skipping NULL check for deprecated register_stream_buffers");
+ ALOGD("%s: Skipping NULL check for deprecated register_stream_buffers", __FUNCTION__);
}
return OK;