diff options
| author | Linux Build Service Account <lnxbuild@quicinc.com> | 2017-05-16 22:51:45 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-05-16 22:51:45 -0700 |
| commit | 15fb965c144ae6afb4936ecdae5f00d2005d2342 (patch) | |
| tree | bea1d34b06631d4bba487d73386eae03b3791bc1 /src/com/android/camera/CaptureModule.java | |
| parent | e230cd94928add9d5865ba496069d20736785eb8 (diff) | |
| parent | 36a419d399f894914dec54dfb93cc7e6005ce175 (diff) | |
| download | android_packages_apps_Snap-15fb965c144ae6afb4936ecdae5f00d2005d2342.tar.gz android_packages_apps_Snap-15fb965c144ae6afb4936ecdae5f00d2005d2342.tar.bz2 android_packages_apps_Snap-15fb965c144ae6afb4936ecdae5f00d2005d2342.zip | |
Merge "SnapdragonCamera: fix crash in HFR" into camera.lnx.3.0-dev
Diffstat (limited to 'src/com/android/camera/CaptureModule.java')
| -rwxr-xr-x | src/com/android/camera/CaptureModule.java | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/com/android/camera/CaptureModule.java b/src/com/android/camera/CaptureModule.java index 60fb57168..d2e8ff1f8 100755 --- a/src/com/android/camera/CaptureModule.java +++ b/src/com/android/camera/CaptureModule.java @@ -3142,8 +3142,13 @@ public class CaptureModule implements CameraModule, PhotoController, mControlAFMode = CaptureRequest.CONTROL_AF_MODE_CONTINUOUS_PICTURE; closePreviewSession(); mFrameProcessor.onClose(); - boolean changed = mUI.setPreviewSize(mVideoPreviewSize.getWidth(), - mVideoPreviewSize.getHeight()); + + Size preview = mVideoPreviewSize; + if (mHighSpeedCapture) { + preview = mVideoSize; + } + boolean changed = mUI.setPreviewSize(preview.getWidth(), + preview.getHeight()); if (changed) { mUI.hideSurfaceView(); mUI.showSurfaceView(); |