diff options
| author | Yin-Chia Yeh <yinchiayeh@google.com> | 2015-03-25 00:05:59 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-03-25 00:05:59 +0000 |
| commit | 525907aa2cf2148186ed55e47e424395b9a43dca (patch) | |
| tree | 947b98272d9e5956eb5c7e08b27895117e1488d2 /camera | |
| parent | ae9710473b88592c557488bfcae71616d9e9b75f (diff) | |
| parent | 54298b338cf9f782f2ac681a15e6cbbb99649350 (diff) | |
| download | frameworks_av-525907aa2cf2148186ed55e47e424395b9a43dca.zip frameworks_av-525907aa2cf2148186ed55e47e424395b9a43dca.tar.gz frameworks_av-525907aa2cf2148186ed55e47e424395b9a43dca.tar.bz2 | |
Merge "Camera: fix metadata assertion"
Diffstat (limited to 'camera')
| -rw-r--r-- | camera/CameraMetadata.cpp | 2 |
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; } |