From d4e8fee560788331f8a7cbe7cb0f03a820bdd4cd Mon Sep 17 00:00:00 2001
From: jamesbluecrow <jamesbluecrow@gmail.com>
Date: Tue, 3 Oct 2017 15:36:48 +0100
Subject: [PATCH] Set PreviewSize as PictureSize when PictureSize for
 AspectRatio is null

---
 .../com/google/android/cameraview/Camera1.java      | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/library/src/main/api14/com/google/android/cameraview/Camera1.java b/library/src/main/api14/com/google/android/cameraview/Camera1.java
index 0f92ac50..e3bcea70 100644
--- a/library/src/main/api14/com/google/android/cameraview/Camera1.java
+++ b/library/src/main/api14/com/google/android/cameraview/Camera1.java
@@ -328,12 +328,19 @@ void adjustCameraParameters() {
         }
         Size size = chooseOptimalSize(sizes);
 
-        // Always re-apply camera parameters
-        // Largest picture size in this ratio
-        final Size pictureSize = mPictureSizes.sizes(mAspectRatio).last();
+        final Size pictureSize;
+        if (mPictureSizes.sizes(mAspectRatio) == null) {
+            pictureSize = size;
+        } else {
+            // Largest picture size in this ratio
+            pictureSize = mPictureSizes.sizes(mAspectRatio).last();
+        }
+
         if (mShowingPreview) {
             mCamera.stopPreview();
         }
+
+        // Always re-apply camera parameters
         mCameraParameters.setPreviewSize(size.getWidth(), size.getHeight());
         mCameraParameters.setPictureSize(pictureSize.getWidth(), pictureSize.getHeight());
         mCameraParameters.setRotation(calcCameraRotation(mDisplayOrientation));