diff options
author | Eino-Ville Talvala <etalvala@google.com> | 2012-10-09 12:52:16 -0700 |
---|---|---|
committer | Eino-Ville Talvala <etalvala@google.com> | 2012-10-09 12:59:16 -0700 |
commit | 4cc45fa65659ff8771a185e4f4584a9b0da10247 (patch) | |
tree | e2ce7e922de36c380f607e3ce3075e93623f4e53 /services | |
parent | 19caf26b1ab1619020aa417d7913c11fd1d5590d (diff) | |
download | frameworks_av-4cc45fa65659ff8771a185e4f4584a9b0da10247.zip frameworks_av-4cc45fa65659ff8771a185e4f4584a9b0da10247.tar.gz frameworks_av-4cc45fa65659ff8771a185e4f4584a9b0da10247.tar.bz2 |
Camera2: Fix uninitialized parameters.
Some parameters were not being set to default values, causing strange
flakiness in any app that wasn't calling setParameters. This includes
many CTS tests.
Bug: 6970468
Change-Id: If91635afc000e23862e7b039292a55349274c5ee
Diffstat (limited to 'services')
-rw-r--r-- | services/camera/libcameraservice/camera2/Parameters.cpp | 8 |
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"); |