commit 54298b338cf9f782f2ac681a15e6cbbb99649350
author Yin-Chia Yeh <yinchiayeh@google.com> Tue Mar 24 16:51:41 2015 -0700
committer Yin-Chia Yeh <yinchiayeh@google.com> Tue Mar 24 16:51:41 2015 -0700
tree ea9027bd6a83df8488aa7d16d237c51f3c93a269
parent 676b21b30edbd74d7b9aae247961a1ffde1b8993

Camera: fix metadata assertion

Bug: 19897963
Change-Id: I6b383c4750f31691a1c02e927bbeb0c1998a9eff

include/camera/CameraMetadata.h

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 @@
      * 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 @@
 
   private:
     camera_metadata_t *mBuffer;
-    bool               mLocked;
+    mutable bool       mLocked;
 
     /**
      * Check if tag has a given type