summaryrefslogtreecommitdiff
path: root/camera/common/1.0/default/include/CameraModule.h
diff options
context:
space:
mode:
authorShuzhen Wang <shuzhenwang@google.com>2018-09-05 09:40:00 -0700
committerShuzhen Wang <shuzhenwang@google.com>2018-10-04 11:56:20 -0700
commit6bdeaf55bf5cb7d313628d0ff092413c42b5782c (patch)
treede9cc1958f6cbf6050dfd8af50bb9fbb51ea10ff /camera/common/1.0/default/include/CameraModule.h
parentc9816c691fdee653c1773fec8a40cef1fcc1c8af (diff)
VTS: Add test for device version 3.5
Also includes: - Add test for getPhysicalCameraCharacteristics. - Doc update for the new HIDL API. - Tighten boundary check for camera ID in CameraModule. Test: vts-tradefed run commandAndExit vts --skip-all-system-status-check --skip-preconditions --module VtsHalCameraProviderV2_4Target -l INFO Bug: 79523700 Bug: 115969176 Bug: 116512585 Change-Id: I051d1b0c91834781a1f8d893ed5ebfa579b03774
Diffstat (limited to 'camera/common/1.0/default/include/CameraModule.h')
-rw-r--r--camera/common/1.0/default/include/CameraModule.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/camera/common/1.0/default/include/CameraModule.h b/camera/common/1.0/default/include/CameraModule.h
index ed853bf85f..aee9654dc7 100644
--- a/camera/common/1.0/default/include/CameraModule.h
+++ b/camera/common/1.0/default/include/CameraModule.h
@@ -75,6 +75,7 @@ private:
int32_t keyTag, const Vector<int32_t>& appendKeys);
status_t filterOpenErrorCode(status_t err);
camera_module_t *mModule;
+ int mNumberOfCameras;
KeyedVector<int, camera_info> mCameraInfoMap;
KeyedVector<int, int> mDeviceVersionMap;
KeyedVector<int, camera_metadata_t*> mPhysicalCameraInfoMap;