commit c2cf01efdcbc5dfcb4ff221b6dfe674759445cbc
author Phil Burk <philburk@google.com> Thu Aug 10 23:58:26 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu Aug 10 23:58:26 2017 +0000
tree ee33d96ae35834330d0ab8c22d28a85a0136ef66
parent 6bde6e15ed12ab1ebae1a864be74e4f8c18ecb72
parent 39ebbc59252e0d4450ff670d93093066bab15a88

Merge "aaudio: deleted FifoBuffers to fix memory leak" into oc-mr1-dev
am: 39ebbc5925

Change-Id: Ibbf1c587586c7f92eb071e96b5e63a41a6949d8e

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;