diff options
| author | Camera Software Integration <camswint@quicinc.com> | 2017-08-03 01:59:10 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-08-03 01:59:10 -0700 |
| commit | c079a380397f56193de7cf7f38831b3b213c986f (patch) | |
| tree | efb415c1a77196557194eda1fac4e6f07eac1c3d /src/com/android/camera/CaptureModule.java | |
| parent | 67531a21cea56a084414cbe7381db0378d4f8787 (diff) | |
| parent | b3f60fb213bba6acc24cf915034853753ce3d49e (diff) | |
| download | android_packages_apps_Snap-c079a380397f56193de7cf7f38831b3b213c986f.tar.gz android_packages_apps_Snap-c079a380397f56193de7cf7f38831b3b213c986f.tar.bz2 android_packages_apps_Snap-c079a380397f56193de7cf7f38831b3b213c986f.zip | |
Merge "Revert "SnapdragonCamera: Fix black screen on preview when switch camera"" into camera.lnx.3.0-dev
Diffstat (limited to 'src/com/android/camera/CaptureModule.java')
| -rw-r--r-- | src/com/android/camera/CaptureModule.java | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/src/com/android/camera/CaptureModule.java b/src/com/android/camera/CaptureModule.java index 7968f887b..50cf0aa2b 100644 --- a/src/com/android/camera/CaptureModule.java +++ b/src/com/android/camera/CaptureModule.java @@ -1045,21 +1045,12 @@ public class CaptureModule implements CameraModule, PhotoController, mCaptureSession[id].setRepeatingRequest(mPreviewRequestBuilder[id] .build(), mCaptureCallback, mCameraHandler); } + if (isClearSightOn()) { ClearSightImageProcessor.getInstance().onCaptureSessionConfigured(id == BAYER_ID, cameraCaptureSession); } else if (mChosenImageFormat == ImageFormat.PRIVATE && id == getMainCameraId()) { mPostProcessor.onSessionConfigured(mCameraDevice[id], mCaptureSession[id]); } - mActivity.runOnUiThread(new Runnable() { - public void run() { - SurfaceHolder sh = mUI.getSurfaceHolder(); - if ( sh != null ) { - sh.setFixedSize(mPreviewSize.getHeight(), - mPreviewSize.getWidth()); - } - } - }); - } catch (CameraAccessException e) { e.printStackTrace(); |