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

services/camera/libcameraservice/common/CameraModule.h

diff --git a/services/camera/libcameraservice/common/CameraModule.h b/services/camera/libcameraservice/common/CameraModule.h
index ecc5b2d..e285b21 100644
--- a/services/camera/libcameraservice/common/CameraModule.h
+++ b/services/camera/libcameraservice/common/CameraModule.h
@@ -54,13 +54,9 @@
     static void deriveCameraCharacteristicsKeys(uint32_t deviceVersion, CameraMetadata &chars);
     status_t filterOpenErrorCode(status_t err);
 
-    struct CameraInfo {
-        CameraMetadata cameraCharacteristics;
-        camera_info    cameraInfo;
-    };
-
     camera_module_t *mModule;
-    KeyedVector<int, CameraInfo> mCameraInfoMap;
+    KeyedVector<int, camera_info> mCameraInfoMap;
+    KeyedVector<int, CameraMetadata> mCameraCharacteristicsMap;
     Mutex mCameraInfoLock;
 };