diff options
| author | codeworkx <daniel.hillenbrand@codeworkx.de> | 2012-07-08 23:01:59 +0200 |
|---|---|---|
| committer | codeworkx <daniel.hillenbrand@codeworkx.de> | 2012-07-08 23:01:59 +0200 |
| commit | 2cd5e9ae434207fc7ab94ccff2df57db343e20fd (patch) | |
| tree | 2014b9e0b5f925784de8500c3192fd5deccbc041 /include | |
| parent | c372786425a41f3a7bb8df47f22eaf08caa91037 (diff) | |
| download | frameworks_base-2cd5e9ae434207fc7ab94ccff2df57db343e20fd.zip frameworks_base-2cd5e9ae434207fc7ab94ccff2df57db343e20fd.tar.gz frameworks_base-2cd5e9ae434207fc7ab94ccff2df57db343e20fd.tar.bz2 | |
camera: fix samsung/qcom conflict
hello ifdef hell
Change-Id: I76bede141dfd4fd4f32b5a5aa8987fb255c207a5
Diffstat (limited to 'include')
| -rw-r--r-- | include/camera/CameraParameters.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/include/camera/CameraParameters.h b/include/camera/CameraParameters.h index a5340b3..7cc3d4e 100644 --- a/include/camera/CameraParameters.h +++ b/include/camera/CameraParameters.h @@ -580,8 +580,6 @@ public: static const char KEY_FULL_VIDEO_SNAP_SUPPORTED[]; #ifdef QCOM_HARDWARE - static const char KEY_ISO_MODE[]; - static const char KEY_SUPPORTED_ISO_MODES[]; static const char KEY_LENSSHADE[] ; static const char KEY_SUPPORTED_LENSSHADE_MODES[] ; @@ -593,6 +591,10 @@ public: static const char KEY_GPS_ALTITUDE_REF[]; static const char KEY_GPS_STATUS[]; static const char KEY_EXIF_DATETIME[]; +#ifndef SAMSUNG_CAMERA_HARDWARE + static const char KEY_ISO_MODE[]; + static const char KEY_SUPPORTED_ISO_MODES[]; +#endif #endif // The state of the video stabilization. If set to true, both the |