diff options
| author | Eino-Ville Talvala <etalvala@google.com> | 2012-10-10 13:19:18 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-10-10 13:19:18 -0700 |
| commit | 4c510b9209f7f75520fd2d62657f08192cc49a51 (patch) | |
| tree | 7005f1922753faf5fd4bdded646123f62db40ed4 /services | |
| parent | 3a8850848f4887105338e3e0e3bb2466fc445d2d (diff) | |
| parent | 6f846139d97ad6cccdd2f243ccf3a19036ad12c7 (diff) | |
| download | frameworks_av-4c510b9209f7f75520fd2d62657f08192cc49a51.zip frameworks_av-4c510b9209f7f75520fd2d62657f08192cc49a51.tar.gz frameworks_av-4c510b9209f7f75520fd2d62657f08192cc49a51.tar.bz2 | |
am 6f846139: am 55f6c9df: Camera2: Do not set auto-white-balance regions from metering regions.
* commit '6f846139d97ad6cccdd2f243ccf3a19036ad12c7':
Camera2: Do not set auto-white-balance regions from metering regions.
Diffstat (limited to 'services')
| -rw-r--r-- | services/camera/libcameraservice/camera2/Parameters.cpp | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/services/camera/libcameraservice/camera2/Parameters.cpp b/services/camera/libcameraservice/camera2/Parameters.cpp index 03dd835..21eb932 100644 --- a/services/camera/libcameraservice/camera2/Parameters.cpp +++ b/services/camera/libcameraservice/camera2/Parameters.cpp @@ -1743,9 +1743,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 |