commit 06ff3b2ca4be68d2e917d61722892436ccd74032
author Ian Pedowitz <ijpedowitz@google.com> Fri Aug 11 15:29:54 2017 +0000
committer android-build-merger <android-build-merger@google.com> Fri Aug 11 15:29:54 2017 +0000
tree 1d8de549c58c3dd710f1a2b3c972b62d11fd9aa7
parent c2cf01efdcbc5dfcb4ff221b6dfe674759445cbc
parent 3c4d63ebff576c77d315899366aa69a0239ee9eb

Merge "screenrecord should default to '--bit-rate 20M'" into oc-mr1-dev
am: 3c4d63ebff

Change-Id: If8e12439522b502c8805d237b9b15ad06b7c3fa2

services/camera/libcameraservice/api1/client2/Parameters.cpp

diff --git a/services/camera/libcameraservice/api1/client2/Parameters.cpp b/services/camera/libcameraservice/api1/client2/Parameters.cpp
index a305bc7..1addcdd 100644
--- a/services/camera/libcameraservice/api1/client2/Parameters.cpp
+++ b/services/camera/libcameraservice/api1/client2/Parameters.cpp
@@ -2200,6 +2200,14 @@
                 normalizedXToArray(meteringAreas[j].right);
             reqMeteringAreas[i + 3] =
                 normalizedYToArray(meteringAreas[j].bottom);
+            // Requested size may be zero by rounding error with/without zooming.
+            // The ae regions should be at least 1 if metering width/height is not zero.
+            if (reqMeteringAreas[i + 0] == reqMeteringAreas[i + 2]) {
+                reqMeteringAreas[i + 2]++;
+            }
+            if (reqMeteringAreas[i + 1] == reqMeteringAreas[i + 3]) {
+                reqMeteringAreas[i + 3]++;
+            }
         } else {
             reqMeteringAreas[i + 0] = 0;
             reqMeteringAreas[i + 1] = 0;