commit 67dcf032a722dab62a15b919bcf717060a2cf166
author Eino-Ville Talvala <etalvala@google.com> Wed Oct 10 13:17:01 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Wed Oct 10 13:17:01 2012 -0700
tree f205a31cb04513e9c1b443bfc53fa3ddb1778957
parent 50016d7e0f61bfbcf7eb490725d954db802a034e
parent 1bf2809d3fd3890a782869a041b70b8e595ecdb6

am 55f6c9df: Camera2: Do not set auto-white-balance regions from metering regions.

* commit '55f6c9dfd713776e251655b3ddd496b17df0926e':
  Camera2: Do not set auto-white-balance regions from metering regions.

services/camera/libcameraservice/camera2/Parameters.cpp

diff --git a/services/camera/libcameraservice/camera2/Parameters.cpp b/services/camera/libcameraservice/camera2/Parameters.cpp
index 05494d3..3c679da 100644
--- a/services/camera/libcameraservice/camera2/Parameters.cpp
+++ b/services/camera/libcameraservice/camera2/Parameters.cpp
@@ -1739,9 +1739,6 @@
             reqMeteringAreas, reqMeteringAreasSize);
     if (res != OK) return res;
 
-    res = request->update(ANDROID_CONTROL_AWB_REGIONS,
-            reqMeteringAreas, reqMeteringAreasSize);
-    if (res != OK) return res;
     delete[] reqMeteringAreas;
 
     /* don't include jpeg thumbnail size - it's valid for