From e4432a09919976b705e56b04e638e78c67a38ac5 Mon Sep 17 00:00:00 2001
From: "srowen@gmail.com"
 <srowen@gmail.com@59b500cc-1b3d-0410-9834-0bbf25fbcc57>
Date: Thu, 8 Aug 2013 08:45:28 +0000
Subject: [PATCH] If camera fails to support its supported and chosen preview
 mode, use its actual setting

git-svn-id: https://zxing.googlecode.com/svn/trunk@2863 59b500cc-1b3d-0410-9834-0bbf25fbcc57
---
 .../android/camera/CameraConfigurationManager.java       | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/android/src/com/google/zxing/client/android/camera/CameraConfigurationManager.java b/android/src/com/google/zxing/client/android/camera/CameraConfigurationManager.java
index 42dbb8c19..7bbb627f0 100644
--- a/android/src/com/google/zxing/client/android/camera/CameraConfigurationManager.java
+++ b/android/src/com/google/zxing/client/android/camera/CameraConfigurationManager.java
@@ -131,6 +131,15 @@ final class CameraConfigurationManager {
 
     parameters.setPreviewSize(cameraResolution.x, cameraResolution.y);
     camera.setParameters(parameters);
+
+    Camera.Parameters afterParameters = camera.getParameters();
+    Camera.Size afterSize = afterParameters.getPreviewSize();
+    if (afterSize!= null && (cameraResolution.x != afterSize.width || cameraResolution.y != afterSize.height)) {
+      Log.w(TAG, "Camera said it supported preview size " + cameraResolution.x + 'x' + cameraResolution.y +
+                 ", but after setting it, preview size is " + afterSize.width + 'x' + afterSize.height);
+      cameraResolution.x = afterSize.width;
+      cameraResolution.y = afterSize.height;
+    }
   }
 
   Point getCameraResolution() {