summaryrefslogtreecommitdiffstats
path: root/camera
diff options
context:
space:
mode:
authorYin-Chia Yeh <yinchiayeh@google.com>2015-03-24 16:51:41 -0700
committerYin-Chia Yeh <yinchiayeh@google.com>2015-03-24 16:51:41 -0700
commit54298b338cf9f782f2ac681a15e6cbbb99649350 (patch)
treeea9027bd6a83df8488aa7d16d237c51f3c93a269 /camera
parent676b21b30edbd74d7b9aae247961a1ffde1b8993 (diff)
downloadframeworks_av-54298b338cf9f782f2ac681a15e6cbbb99649350.zip
frameworks_av-54298b338cf9f782f2ac681a15e6cbbb99649350.tar.gz
frameworks_av-54298b338cf9f782f2ac681a15e6cbbb99649350.tar.bz2
Camera: fix metadata assertion
Bug: 19897963 Change-Id: I6b383c4750f31691a1c02e927bbeb0c1998a9eff
Diffstat (limited to 'camera')
-rw-r--r--camera/CameraMetadata.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/camera/CameraMetadata.cpp b/camera/CameraMetadata.cpp
index 043437f..e216d26 100644
--- a/camera/CameraMetadata.cpp
+++ b/camera/CameraMetadata.cpp
@@ -74,7 +74,7 @@ CameraMetadata::~CameraMetadata() {
clear();
}
-const camera_metadata_t* CameraMetadata::getAndLock() {
+const camera_metadata_t* CameraMetadata::getAndLock() const {
mLocked = true;
return mBuffer;
}