diff options
| author | Brint E. Kriebel <bekit@cyngn.com> | 2014-11-18 13:45:53 -0800 |
|---|---|---|
| committer | Brint E. Kriebel <bekit@cyngn.com> | 2014-11-18 13:45:53 -0800 |
| commit | 2fa08d8a1e43aaab3986b187a02f425050aae7b9 (patch) | |
| tree | a5d74580321036b1621d751c36a5a75c37e22876 /include/camera/CameraParameters.h | |
| parent | db54d08b2628ccfa7d0c60397d49932a04eef37d (diff) | |
| parent | 7e69909dd1da9c3602d9e231c85d0efd154951f1 (diff) | |
| download | frameworks_av-stable/cm-11.0-XNF8Y.tar.gz frameworks_av-stable/cm-11.0-XNF8Y.tar.bz2 frameworks_av-stable/cm-11.0-XNF8Y.zip | |
Merge branch 'cm-11.0' into stable/cm-11.0cm-11.0-XNPH05Q-tomato-9828f8e9ccstable/cm-11.0-XNF8Yshipping/cm-11.0
Diffstat (limited to 'include/camera/CameraParameters.h')
| -rw-r--r-- | include/camera/CameraParameters.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/include/camera/CameraParameters.h b/include/camera/CameraParameters.h index 02928f06cd..39ccef352c 100644 --- a/include/camera/CameraParameters.h +++ b/include/camera/CameraParameters.h @@ -19,6 +19,7 @@ #include <utils/KeyedVector.h> #include <utils/String8.h> +#include <camera/CameraParametersExtra.h> namespace android { @@ -1082,6 +1083,10 @@ public: void getSupportedHfrSizes(Vector<Size> &sizes) const; #endif +#ifdef CAMERA_PARAMETERS_EXTRA_H +CAMERA_PARAMETERS_EXTRA_H +#endif + private: DefaultKeyedVector<String8,String8> mMap; }; |