diff options
| author | Chien-Yu Chen <cychen@google.com> | 2015-02-24 10:28:19 -0800 |
|---|---|---|
| committer | Yin-Chia Yeh <yinchiayeh@google.com> | 2015-03-24 11:52:20 -0700 |
| commit | 676b21b30edbd74d7b9aae247961a1ffde1b8993 (patch) | |
| tree | b75567ef13d0c3b235e94fcf3e38d576ab505f96 /services/camera/libcameraservice/device1 | |
| parent | 0e4421286b92a81e952f53210227adbf05d97c25 (diff) | |
| download | frameworks_av-676b21b30edbd74d7b9aae247961a1ffde1b8993.zip frameworks_av-676b21b30edbd74d7b9aae247961a1ffde1b8993.tar.gz frameworks_av-676b21b30edbd74d7b9aae247961a1ffde1b8993.tar.bz2 | |
camera: update CameraModule
1. Add more accessor methods to CameraModule to prevent exposing
raw module pointer
2. Use KeyedVector to replace array
Bug: 19897963
Change-Id: I111cc093f09f5fb3c4b13693d5d0687e1f441058
Diffstat (limited to 'services/camera/libcameraservice/device1')
| -rw-r--r-- | services/camera/libcameraservice/device1/CameraHardwareInterface.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/services/camera/libcameraservice/device1/CameraHardwareInterface.h b/services/camera/libcameraservice/device1/CameraHardwareInterface.h index f5ebbf8..7f14cd4 100644 --- a/services/camera/libcameraservice/device1/CameraHardwareInterface.h +++ b/services/camera/libcameraservice/device1/CameraHardwareInterface.h @@ -97,7 +97,7 @@ public: if (res != OK) return res; int rc = OK; - if (module->getRawModule()->module_api_version >= CAMERA_MODULE_API_VERSION_2_3 && + if (module->getModuleApiVersion() >= CAMERA_MODULE_API_VERSION_2_3 && info.device_version > CAMERA_DEVICE_API_VERSION_1_0) { // Open higher version camera device as HAL1.0 device. rc = module->openLegacy(mName.string(), |