diff options
| author | Steve Kondik <shade@chemlab.org> | 2013-01-09 00:27:31 -0800 |
|---|---|---|
| committer | Steve Kondik <shade@chemlab.org> | 2013-01-09 00:27:31 -0800 |
| commit | 4c25e5ce31d073c934dfd21011f6662830e7097c (patch) | |
| tree | 7f14331eee6a6512280cfe958e19772d6be92220 | |
| parent | deb5d8a7ae0b4c0189402ba8c8e58d7e294f5376 (diff) | |
| download | frameworks_av-4c25e5ce31d073c934dfd21011f6662830e7097c.zip frameworks_av-4c25e5ce31d073c934dfd21011f6662830e7097c.tar.gz frameworks_av-4c25e5ce31d073c934dfd21011f6662830e7097c.tar.bz2 | |
Fix the build on non-QCOM
Change-Id: Idb8d5c98fbdc01e6063ad0eb224baba66acc813d
| -rw-r--r-- | camera/CameraParameters.cpp | 5 | ||||
| -rw-r--r-- | include/camera/CameraParameters.h | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/camera/CameraParameters.cpp b/camera/CameraParameters.cpp index bfe756c..0931c2c 100644 --- a/camera/CameraParameters.cpp +++ b/camera/CameraParameters.cpp @@ -136,11 +136,10 @@ const char CameraParameters::KEY_VIDEO_STABILIZATION_SUPPORTED[] = "video-stabil const char CameraParameters::KEY_ZSL[] = "zsl"; const char CameraParameters::KEY_SUPPORTED_ZSL_MODES[] = "zsl-values"; const char CameraParameters::KEY_CAMERA_MODE[] = "camera-mode"; -#endif -const char CameraParameters::KEY_AE_BRACKET_HDR[] = "ae-bracket-hdr"; - const char CameraParameters::KEY_POWER_MODE[] = "power-mode"; const char CameraParameters::KEY_POWER_MODE_SUPPORTED[] = "power-mode-supported"; +#endif +const char CameraParameters::KEY_AE_BRACKET_HDR[] = "ae-bracket-hdr"; /*only effective when KEY_AE_BRACKET_HDR set to ae_bracketing*/ //const char CameraParameters::KEY_AE_BRACKET_SETTING_KEY[] = "ae-bracket-setting"; diff --git a/include/camera/CameraParameters.h b/include/camera/CameraParameters.h index bf792a4..e82d8e7 100644 --- a/include/camera/CameraParameters.h +++ b/include/camera/CameraParameters.h @@ -568,7 +568,6 @@ public: // Example value: "true" or "false". Read only. static const char KEY_VIDEO_SNAPSHOT_SUPPORTED[]; static const char KEY_FULL_VIDEO_SNAP_SUPPORTED[]; - static const char KEY_POWER_MODE_SUPPORTED[]; #ifdef QCOM_HARDWARE static const char KEY_ISO_MODE[]; @@ -604,6 +603,7 @@ public: static const char KEY_MEMORY_COLOR_ENHANCEMENT[]; static const char KEY_SUPPORTED_MEM_COLOR_ENHANCE_MODES[]; + static const char KEY_POWER_MODE_SUPPORTED[]; static const char KEY_POWER_MODE[]; static const char KEY_ZSL[]; |