merge in jb-mr1-factory-release history after reset to jb-mr1-dev
merge in jb-mr1-factory-release history after reset to jb-mr1-dev
merge in jb-mr1-factory-release history after reset to jb-mr1-dev
merge in jb-mr1-factory-release history after reset to jb-mr1-dev
merge in jb-mr1-factory-release history after reset to jb-mr1-dev
camera: Changes to match ZSL snapshot match issue.

Preview frames are blocked when takePicture is issued. Changes to
make sure send Preview frames till actual snapshot frames received.
Change to handle the case when startPreview issued after takePicture
without stopPreview.

Bug: 7349527
Change-Id: I155b92fe0858b0eb1ea00cb4d0f4601e8bc98c17
Signed-off-by: Iliyan Malchev <malchev@google.com>
use pthread_cond_timedwait() in poll thread

This does not fix the underlying causes for the hangs in HDR mode, but should
allow the HAL to recover in case of that failure, by replacing the
pthread_cond_wait()s with pthread_cond_timedwait()s that timed out after 2
seconds.

Bug: 7305012
Bug: 7301582
Change-Id: I213f52755a0157bec413d19a14d8a1340de14ae0
Signed-off-by: Iliyan Malchev <malchev@google.com>
camera: enhancement af functionality

-add case for reading AF status and retry value

Bug: 7324783
Change-Id: Ia377b54f296d2b7a240883d6ae128574359ebaba
Signed-off-by: Iliyan Malchev <malchev@google.com>
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
camera: disallow opening multiple camera instances

Bug: 7448989
Bug: 7461553
Change-Id: Iccf3573e71ed3c264f5175103dcbbab43a3efb0e
Signed-off-by: Iliyan Malchev <malchev@google.com>
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge

Change-Id: Id21c5cc3e276166c24009244a452f268fd64571e
Camera: Don't run continuous autofocus in startPreview2.

Continuous autofocus should only be triggered if focus mode is
CONTINUOUS_VIDEO or CONTINUOUS_CAPTURE. If focus mode is AUTO,
only auto_focus function call can start focus.

Bug: 7563139
Change-Id: I3242adc6704f3be02e0c3487b0310b1ff21d0ba5
Signed-off-by: Iliyan Malchev <malchev@google.com>
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
Revert "Camera: Fix compile if BOARD_USES_CAMERA_FAST_AUTOFOCUS is not defined"

This reverts commit 32d9d8fb1050c1868edaf2f16df22941f645d1b9.
Merge remote-tracking branch 'aosp/jb-mr1.1-release' into HEAD
camera.$(TARGET_DEVICE): FPSRange gets defined twice for devices which
use the qcom camera hal and the QCOM_HARDWARE define. It is also defined
in frameworks/av/include/camera/CameraParameters.h . QCameraParameters.h
includes that header, so FPSRange should only be defined here if not
defined already.

Change-Id: Ib621740645e63c8f5d2ea5665c598d3b196cd347