Snap: Only set preferred preview sizes if they are valid

* Check if a preferred photo preview size is valid before using it.

Change-Id: Ia9580b68b60df9784f657df16b317748ff40a696

1 files changed, 6 insertions, 2 deletions

diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java
index b99a4640c..c15abbc07 100755
--- a/src/com/android/camera/PhotoModule.java
+++ b/src/com/android/camera/PhotoModule.java
@@ -3875,8 +3875,12 @@ public class PhotoModule
         try {
             android.util.Size previewSize = android.util.Size.parseSize(previewSizeForPhoto);
 
-            optimalSize.width = previewSize.getWidth();
-            optimalSize.height = previewSize.getHeight();
+            for (Size s : sizes) {
+                if (s.width == previewSize.getWidth() && s.height == previewSize.getHeight()) {
+                    optimalSize.width = previewSize.getWidth();
+                    optimalSize.height = previewSize.getHeight();
+                }
+            }
             Log.v(TAG, "Preview resolution hardcoded to " + optimalSize.width + "x" + optimalSize.height);
         } catch (NumberFormatException e) {
             Log.e(TAG, "Invalid preview resolution: " + previewSizeForPhoto);