commit 5f5dfd4e69f2c92b3f323b0c4e0ff3e5cff6885f
author Emilian Peev <epeev@google.com> Thu Aug 10 15:16:22 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu Aug 10 15:16:22 2017 +0000
tree 882905070af510b7ebd085d48de8b3fe227bf831
parent 52c1e0bcdbb9b4bff0a7581f53f58c24db7f1c82
parent 81ae83bd1dff600d4b219227bbe5538006cf8ce8

Merge changes from topic 'gralloc_usage_flags' into oc-mr1-dev
am: 81ae83bd1d

Change-Id: Ib60cb2188caf822442fc87ae5fd6d0168bae5c24

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;