SnapdragonCamera: allow some deviation on screen ratio

Some screen resolutions are not exactly but very close to 16:9.
Allow some deviation to enable new preview feature on these screens.

Change-Id: I85db85bf43dacaa510184dd7ba3308a9aa914d4a
CRs-Fixed: 780739

1 files changed, 3 insertions, 11 deletions

diff --git a/src/com/android/camera/util/CameraUtil.java b/src/com/android/camera/util/CameraUtil.java
index 08ce84d87..dbd2cc36d 100644
--- a/src/com/android/camera/util/CameraUtil.java
+++ b/src/com/android/camera/util/CameraUtil.java
@@ -1073,18 +1073,10 @@ public class CameraUtil {
     }
 
     public static int determineRatio(int width, int height) {
-        int s = width, l = height;
-        if (width > height) {
-            l = width;
-            s = height;
-        }
-        if (l * 3 == s * 4) {
-            return RATIO_4_3;
-        } else if (l * 9 == s * 16) {
-            return RATIO_16_9;
-        } else {
-            return RATIO_UNKNOWN;
+        if (height != 0) {
+            return determineRatio(((float) width) / height);
         }
+        return RATIO_UNKNOWN;
     }
 
     public static int determineRatio(float ratio) {