Fall back to bounds if provided width/height is 0

Monkey results show async dimensions can lag behind
automated filmstrip. Protect against this case, should
reduce monkey issues.

Bug: 21023148
Change-Id: I8fef5e8d00f96c4b4c249b3a9daebfcf9991e193

diff --git a/src/com/android/camera/util/CameraUtil.java b/src/com/android/camera/util/CameraUtil.java
index eb4f788..a2a5a7d 100644 (file)
--- a/src/com/android/camera/util/CameraUtil.java
+++ b/src/com/android/camera/util/CameraUtil.java
@@ -993,10 +993,18 @@ public class CameraUtil {
         p.x = boundWidth;
         p.y = boundHeight;
 
-        if (imageWidth * boundHeight > boundWidth * imageHeight) {
-            p.y = imageHeight * p.x / imageWidth;
+        // In some cases like automated testing, image height/width may not be
+        // loaded, to avoid divide by zero fall back to provided bounds.
+        if (imageWidth != 0 && imageHeight != 0) {
+            if (imageWidth * boundHeight > boundWidth * imageHeight) {
+                p.y = imageHeight * p.x / imageWidth;
+            } else {
+                p.x = imageWidth * p.y / imageHeight;
+            }
         } else {
-            p.x = imageWidth * p.y / imageHeight;
+            Log.w(TAG, "zero width/height, falling back to bounds (w|h|bw|bh):"
+                    + imageWidth + "|" + imageHeight + "|" + boundWidth + "|"
+                    + boundHeight);
         }
 
         return p;