summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/com/android/camera/PhotoModule.java17
1 files changed, 9 insertions, 8 deletions
diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java
index 78fe8ee..db12222 100644
--- a/src/com/android/camera/PhotoModule.java
+++ b/src/com/android/camera/PhotoModule.java
@@ -1172,7 +1172,7 @@ public class PhotoModule
mParameters = mCameraDevice.getParameters();
mBurstSnapNum = CameraUtil.getNumSnapsPerShutter(mParameters);
}
- Log.v(TAG, "JpegPictureCallback: Received = " + mReceivedSnapNum +
+ Log.v(TAG, "JpegPictureCallback: Received = " + mReceivedSnapNum + " " +
"Burst count = " + mBurstSnapNum);
// If postview callback has arrived, the captured image is displayed
// in postview callback. If not, the captured image is displayed in
@@ -1204,26 +1204,27 @@ public class PhotoModule
needRestartPreview |= ((mReceivedSnapNum == mBurstSnapNum) &&
!mFocusManager.isZslEnabled() &&
CameraUtil.SCENE_MODE_HDR.equals(mSceneMode));
- needRestartPreview |= mLgeHdrMode;
+ needRestartPreview |= mLgeHdrMode && (mCameraState != LONGSHOT);
boolean backCameraRestartPreviewOnPictureTaken = false;
boolean frontCameraRestartPreviewOnPictureTaken = false;
if (mApplicationContext != null) {
- backCameraRestartPreviewOnPictureTaken =
+ backCameraRestartPreviewOnPictureTaken =
mApplicationContext.getResources().getBoolean(R.bool.back_camera_restart_preview_onPictureTaken);
- frontCameraRestartPreviewOnPictureTaken =
+ frontCameraRestartPreviewOnPictureTaken =
mApplicationContext.getResources().getBoolean(R.bool.front_camera_restart_preview_onPictureTaken);
}
CameraInfo info = CameraHolder.instance().getCameraInfo()[mCameraId];
- if ((info.facing == CameraInfo.CAMERA_FACING_BACK
- && backCameraRestartPreviewOnPictureTaken)
- || (info.facing == CameraInfo.CAMERA_FACING_FRONT
- && frontCameraRestartPreviewOnPictureTaken)) {
+ if ((info.facing == CameraInfo.CAMERA_FACING_BACK
+ && backCameraRestartPreviewOnPictureTaken && (mCameraState != LONGSHOT))
+ || (info.facing == CameraInfo.CAMERA_FACING_FRONT
+ && frontCameraRestartPreviewOnPictureTaken && (mCameraState != LONGSHOT))) {
needRestartPreview = true;
}
if (needRestartPreview) {
+ Log.d(TAG, "JpegPictureCallback: needRestartPreview");
setupPreview();
if (CameraUtil.FOCUS_MODE_CONTINUOUS_PICTURE.equals(mFocusManager.getFocusMode())
|| CameraUtil.FOCUS_MODE_MW_CONTINUOUS_PICTURE.equals(mFocusManager.getFocusMode())) {