commit f402866c6aab58d8f991f1122976714caebf7eee
author Treehugger Robot <treehugger-gerrit@google.com> Fri Jul 21 20:37:34 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Jul 21 20:37:34 2017 +0000
tree 01a709ca8f3795dd226f12eb9d544aa6b46a20b8
parent cf6eb0a136cd9700c49992afa78d2c46236c2306
parent 0a484a048208b130c13ba1ee959b6c6a45c446b3

Merge "Camera: Correct ae regions request for metering area"

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 9a7839b..ae6abb7 100644
--- a/services/camera/libcameraservice/api1/client2/Parameters.cpp
+++ b/services/camera/libcameraservice/api1/client2/Parameters.cpp
@@ -2108,6 +2108,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;