SnapdragonCamera: When mono preview hidden, don't set repeating request

Don't set a repeating request for mono preview when mono preview option
is set to off in dual camera mode.

CRs-Fixed: 993611
Change-Id: I615483a8ed24689692136e9e2007f19898db5a24

1 files changed, 42 insertions, 10 deletions

diff --git a/src/com/android/camera/CaptureModule.java b/src/com/android/camera/CaptureModule.java
index bf63de271..33498f070 100644
--- a/src/com/android/camera/CaptureModule.java
+++ b/src/com/android/camera/CaptureModule.java
@@ -558,6 +558,11 @@ public class CaptureModule implements CameraModule, PhotoController,
                     mSettingsManager.getSensorActiveArraySize(getMainCameraId()));
     }
 
+    private boolean canStartMonoPreview() {
+        return getCameraMode() == MONO_MODE ||
+                (getCameraMode() == DUAL_MODE && isMonoPreviewOn());
+    }
+
     private boolean isMonoPreviewOn() {
         String value = mSettingsManager.getValue(SettingsManager.KEY_MONO_PREVIEW);
         if (value == null) return false;
@@ -720,8 +725,15 @@ public class CaptureModule implements CameraModule, PhotoController,
                                     mIsLinked = true;
                                 }
                                 // Finally, we start displaying the camera preview.
-                                mCaptureSession[id].setRepeatingRequest(mPreviewRequestBuilder[id]
-                                        .build(), mCaptureCallback, mCameraHandler);
+                                // for cases where we are in dual mode with mono preview off,
+                                // don't set repeating request for mono
+                                if(id == MONO_ID && !canStartMonoPreview()) {
+                                    mCaptureSession[id].capture(mPreviewRequestBuilder[id]
+                                            .build(), mCaptureCallback, mCameraHandler);
+                                } else {
+                                    mCaptureSession[id].setRepeatingRequest(mPreviewRequestBuilder[id]
+                                            .build(), mCaptureCallback, mCameraHandler);
+                                }
                                 if (isClearSightOn()) {
                                     ClearSightImageProcessor.getInstance().onCaptureSessionConfigured(id == BAYER_ID, cameraCaptureSession);
                                 }
@@ -807,8 +819,13 @@ public class CaptureModule implements CameraModule, PhotoController,
         mPreviewRequestBuilder[id].set(CaptureRequest.LENS_FOCUS_DISTANCE, fd);
         mPreviewRequestBuilder[id].setTag(id);
         try {
-            mCaptureSession[id].setRepeatingRequest(mPreviewRequestBuilder[id]
-                    .build(), mCaptureCallback, mCameraHandler);
+            if(id == MONO_ID && !canStartMonoPreview()) {
+                mCaptureSession[id].capture(mPreviewRequestBuilder[id]
+                        .build(), mCaptureCallback, mCameraHandler);
+            } else {
+                mCaptureSession[id].setRepeatingRequest(mPreviewRequestBuilder[id]
+                        .build(), mCaptureCallback, mCameraHandler);
+            }
         } catch (CameraAccessException e) {
             e.printStackTrace();
         }
@@ -1300,8 +1317,13 @@ public class CaptureModule implements CameraModule, PhotoController,
             mState[id] = STATE_PREVIEW;
             mControlAFMode = CaptureRequest.CONTROL_AF_MODE_CONTINUOUS_PICTURE;
             setAFModeToPreview(id, mControlAFMode);
-            mCaptureSession[id].setRepeatingRequest(mPreviewRequestBuilder[id].build(),
-                    mCaptureCallback, mCameraHandler);
+            if(id == MONO_ID && !canStartMonoPreview()) {
+                mCaptureSession[id].capture(mPreviewRequestBuilder[id]
+                        .build(), mCaptureCallback, mCameraHandler);
+            } else {
+                mCaptureSession[id].setRepeatingRequest(mPreviewRequestBuilder[id].build(),
+                        mCaptureCallback, mCameraHandler);
+            }
             mTakingPicture[id] = false;
             mActivity.runOnUiThread(new Runnable() {
                 @Override
@@ -2625,8 +2647,13 @@ public class CaptureModule implements CameraModule, PhotoController,
     private void applyZoomAndUpdate(int id) {
         applyZoom(mPreviewRequestBuilder[id], id);
         try {
-            mCaptureSession[id].setRepeatingRequest(mPreviewRequestBuilder[id]
-                    .build(), mCaptureCallback, mCameraHandler);
+            if(id == MONO_ID && !canStartMonoPreview()) {
+                mCaptureSession[id].capture(mPreviewRequestBuilder[id]
+                        .build(), mCaptureCallback, mCameraHandler);
+            } else {
+                mCaptureSession[id].setRepeatingRequest(mPreviewRequestBuilder[id]
+                        .build(), mCaptureCallback, mCameraHandler);
+            }
         } catch (CameraAccessException e) {
             e.printStackTrace();
         }
@@ -2961,8 +2988,13 @@ public class CaptureModule implements CameraModule, PhotoController,
         }
         if (updatePreviewMono) {
             try {
-                mCaptureSession[MONO_ID].setRepeatingRequest(mPreviewRequestBuilder[MONO_ID]
-                        .build(), mCaptureCallback, mCameraHandler);
+                if(canStartMonoPreview()) {
+                    mCaptureSession[MONO_ID].setRepeatingRequest(mPreviewRequestBuilder[MONO_ID]
+                            .build(), mCaptureCallback, mCameraHandler);
+                } else {
+                    mCaptureSession[MONO_ID].capture(mPreviewRequestBuilder[MONO_ID]
+                            .build(), mCaptureCallback, mCameraHandler);
+                }
             } catch (CameraAccessException e) {
                 e.printStackTrace();
             }