summaryrefslogtreecommitdiffstats
path: root/camera
diff options
context:
space:
mode:
authorKonsta <konsta09@gmail.com>2014-08-15 21:04:15 +0300
committerDan Pasanen <dan.pasanen@gmail.com>2015-10-14 05:27:33 -0700
commit70e359f102a3c40cad45ff9ce5a2b3bcdb429658 (patch)
treef56b7cd2e9b8616de5c51da05fb146539a282efa /camera
parent7ed92e49dc3d8048bdfe5b5e0683f26c90bdace5 (diff)
downloadframeworks_av-70e359f102a3c40cad45ff9ce5a2b3bcdb429658.zip
frameworks_av-70e359f102a3c40cad45ff9ce5a2b3bcdb429658.tar.gz
frameworks_av-70e359f102a3c40cad45ff9ce5a2b3bcdb429658.tar.bz2
camera: allow device to append camera parameters
Overload using include/camera/CameraParametersExtra.h in device tree to add device specific camera parameters. Change-Id: Ie79380f4e49661348df4b2028ddf48daa67fca2d
Diffstat (limited to 'camera')
-rw-r--r--camera/CameraParameters.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/camera/CameraParameters.cpp b/camera/CameraParameters.cpp
index 68969cf..590ff4a 100644
--- a/camera/CameraParameters.cpp
+++ b/camera/CameraParameters.cpp
@@ -21,6 +21,7 @@
#include <string.h>
#include <stdlib.h>
#include <camera/CameraParameters.h>
+#include <camera/CameraParametersExtra.h>
#include <system/graphics.h>
namespace android {
@@ -173,6 +174,10 @@ const char CameraParameters::FOCUS_MODE_CONTINUOUS_PICTURE[] = "continuous-pictu
const char CameraParameters::LIGHTFX_LOWLIGHT[] = "low-light";
const char CameraParameters::LIGHTFX_HDR[] = "high-dynamic-range";
+#ifdef CAMERA_PARAMETERS_EXTRA_C
+CAMERA_PARAMETERS_EXTRA_C
+#endif
+
CameraParameters::CameraParameters()
: mMap()
{