summaryrefslogtreecommitdiffstats
path: root/services/camera
diff options
context:
space:
mode:
authorEino-Ville Talvala <etalvala@google.com>2012-10-09 15:22:46 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-10-09 15:22:47 -0700
commitdca0ac2193e87c57d871dd208073107408c13c0a (patch)
tree4632d5661478be1e59b54f943c57db2023f78d2b /services/camera
parent3d84d38e7ac02b47d17f4bb272f18f8b0e873104 (diff)
parenta3ee047fd8e2a63253f70346925c3ffd069dfc99 (diff)
downloadframeworks_av-dca0ac2193e87c57d871dd208073107408c13c0a.zip
frameworks_av-dca0ac2193e87c57d871dd208073107408c13c0a.tar.gz
frameworks_av-dca0ac2193e87c57d871dd208073107408c13c0a.tar.bz2
Merge "Camera2: Fix uninitialized parameters." into jb-mr1-dev
Diffstat (limited to 'services/camera')
-rw-r--r--services/camera/libcameraservice/camera2/Parameters.cpp8
1 files changed, 8 insertions, 0 deletions
diff --git a/services/camera/libcameraservice/camera2/Parameters.cpp b/services/camera/libcameraservice/camera2/Parameters.cpp
index 199e525..05494d3 100644
--- a/services/camera/libcameraservice/camera2/Parameters.cpp
+++ b/services/camera/libcameraservice/camera2/Parameters.cpp
@@ -271,6 +271,10 @@ status_t Parameters::initialize(const CameraMetadata *info) {
jpegRotation);
gpsEnabled = false;
+ gpsCoordinates[0] = 0.0;
+ gpsCoordinates[1] = 0.0;
+ gpsCoordinates[2] = 0.0;
+ gpsTimestamp = 0;
gpsProcessingMethod = "unknown";
// GPS fields in CameraParameters are not set by implementation
@@ -742,12 +746,14 @@ status_t Parameters::initialize(const CameraMetadata *info) {
params.set(CameraParameters::KEY_VIDEO_FRAME_FORMAT,
CameraParameters::PIXEL_FORMAT_ANDROID_OPAQUE);
+ recordingHint = false;
params.set(CameraParameters::KEY_RECORDING_HINT,
CameraParameters::FALSE);
params.set(CameraParameters::KEY_VIDEO_SNAPSHOT_SUPPORTED,
CameraParameters::TRUE);
+ videoStabilization = false;
params.set(CameraParameters::KEY_VIDEO_STABILIZATION,
CameraParameters::FALSE);
@@ -772,10 +778,12 @@ status_t Parameters::initialize(const CameraMetadata *info) {
enableFocusMoveMessages = false;
afTriggerCounter = 1;
currentAfTriggerId = -1;
+ afInMotion = false;
precaptureTriggerCounter = 1;
previewCallbackFlags = 0;
+ previewCallbackOneShot = false;
char value[PROPERTY_VALUE_MAX];
property_get("camera.disable_zsl_mode", value, "0");