summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--camera/CameraHal.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/camera/CameraHal.cpp b/camera/CameraHal.cpp
index 5f18341..25147d6 100644
--- a/camera/CameraHal.cpp
+++ b/camera/CameraHal.cpp
@@ -1634,7 +1634,9 @@ void CameraHal::stopPreview()
return;
}
- if(mDisplayPaused)
+ bool imageCaptureRunning = (mCameraAdapter->getState() == CameraAdapter::CAPTURE_STATE) &&
+ (mCameraAdapter->getNextState() != CameraAdapter::PREVIEW_STATE);
+ if(mDisplayPaused && !imageCaptureRunning)
{
// Display is paused, which essentially means there is no preview active.
// Note: this is done so that when stopPreview is called by client after