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 /include | |
| 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 'include')
| -rw-r--r-- | include/camera/CameraMetadata.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/camera/CameraMetadata.h b/include/camera/CameraMetadata.h index 1254d3c..953d711 100644 --- a/include/camera/CameraMetadata.h +++ b/include/camera/CameraMetadata.h @@ -56,7 +56,7 @@ class CameraMetadata { * thread-safety, it simply prevents the camera_metadata_t pointer returned * here from being accidentally invalidated by CameraMetadata operations. */ - const camera_metadata_t* getAndLock(); + const camera_metadata_t* getAndLock() const; /** * Unlock the CameraMetadata for use again. After this unlock, the pointer @@ -208,7 +208,7 @@ class CameraMetadata { private: camera_metadata_t *mBuffer; - bool mLocked; + mutable bool mLocked; /** * Check if tag has a given type |