summaryrefslogtreecommitdiffstats
path: root/services
diff options
context:
space:
mode:
authorEino-Ville Talvala <etalvala@google.com>2012-10-10 13:17:01 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-10-10 13:17:01 -0700
commit67dcf032a722dab62a15b919bcf717060a2cf166 (patch)
treef205a31cb04513e9c1b443bfc53fa3ddb1778957 /services
parent50016d7e0f61bfbcf7eb490725d954db802a034e (diff)
parent1bf2809d3fd3890a782869a041b70b8e595ecdb6 (diff)
downloadframeworks_av-67dcf032a722dab62a15b919bcf717060a2cf166.zip
frameworks_av-67dcf032a722dab62a15b919bcf717060a2cf166.tar.gz
frameworks_av-67dcf032a722dab62a15b919bcf717060a2cf166.tar.bz2
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.
Diffstat (limited to 'services')
-rw-r--r--services/camera/libcameraservice/camera2/Parameters.cpp3
1 files changed, 0 insertions, 3 deletions
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 @@ status_t Parameters::updateRequest(CameraMetadata *request) const {
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