Merge "Choose the preview size that has the same aspect ratio as picture size."

1 files changed, 8 insertions, 9 deletions

diff --git a/src/com/android/camera/Camera.java b/src/com/android/camera/Camera.java
index 2905ba0..4adff4d 100644
--- a/src/com/android/camera/Camera.java
+++ b/src/com/android/camera/Camera.java
@@ -1879,17 +1879,16 @@ public class Camera extends NoSearchActivity implements View.OnClickListener,
         List<Size> sizes = mParameters.getSupportedPreviewSizes();
         Size optimalSize = Util.getOptimalPreviewSize(this,
                 sizes, (double) size.width / size.height);
-        if (optimalSize != null) {
-            Size original = mParameters.getPreviewSize();
-            if (!original.equals(optimalSize)) {
-                mParameters.setPreviewSize(optimalSize.width, optimalSize.height);
+        Size original = mParameters.getPreviewSize();
+        if (!original.equals(optimalSize)) {
+            mParameters.setPreviewSize(optimalSize.width, optimalSize.height);
 
-                // Zoom related settings will be changed for different preview
-                // sizes, so set and read the parameters to get lastest values
-                mCameraDevice.setParameters(mParameters);
-                mParameters = mCameraDevice.getParameters();
-            }
+            // Zoom related settings will be changed for different preview
+            // sizes, so set and read the parameters to get lastest values
+            mCameraDevice.setParameters(mParameters);
+            mParameters = mCameraDevice.getParameters();
         }
+        Log.v(TAG, "Preview size is " + optimalSize.width + "x" + optimalSize.height);
 
         // Since change scene mode may change supported values,
         // Set scene mode first,