summaryrefslogtreecommitdiff
authorjiyu.yang <jiyu.yang@amlogic.com>2013-12-21 06:49:22 (GMT)
committer tao.dong <tao.dong@amlogic.com>2013-12-27 02:27:48 (GMT)
commitab14cc4e7fb1857445a76cb272c341bc717c531f (patch)
tree9697e77da5ff30c4daea9638076b417fa9790801
parenta117d80c9c37b48d4bc9757582db0a7cbdc44064 (diff)
downloadcamera-ab14cc4e7fb1857445a76cb272c341bc717c531f.zip
camera-ab14cc4e7fb1857445a76cb272c341bc717c531f.tar.gz
camera-ab14cc4e7fb1857445a76cb272c341bc717c531f.tar.bz2
PD#83224: inactive pause when forceStopPreview
Diffstat
-rwxr-xr-xCameraHal.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/CameraHal.cpp b/CameraHal.cpp
index f8a4891..a46f94b 100755
--- a/CameraHal.cpp
+++ b/CameraHal.cpp
@@ -3617,6 +3617,11 @@ void CameraHal::forceStopPreview()
// stop bracketing if it is running
stopImageBracketing();
+ if (mDisplayPaused){
+ mDisplayPaused = false;
+ mDisplayAdapter->pauseDisplay(mDisplayPaused);
+ CAMHAL_LOGVA("native window to pause state false\n");
+ }
if(mDisplayAdapter.get() != NULL) {
///Stop the buffer display first
mDisplayAdapter->disableDisplay();
@@ -3648,7 +3653,6 @@ void CameraHal::forceStopPreview()
freePreviewDataBufs();
mPreviewEnabled = false;
- mDisplayPaused = false;
mPreviewStartInProgress = false;
LOG_FUNCTION_NAME_EXIT;