commit 6bde6e15ed12ab1ebae1a864be74e4f8c18ecb72
author Jerry Zhang <zhangjerry@google.com> Thu Aug 10 22:28:52 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu Aug 10 22:28:52 2017 +0000
tree 085fc13cd1eae2e5bdf7cb8b38f73e7aa1a9cadc
parent ea694dfca452c9def64261d13d834189fb8ea0a3
parent 840f6990fb01d048ebae9036e9f0dbf12b76d4cb

Merge "Stop capturing mtp_event by reference in lambda" into oc-mr1-dev
am: 840f6990fb

Change-Id: Ib619ca8a319db6541320c2330f53013f0cb6526c

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;