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 | e6ff6cd2fe5c897803d8dfc2d575c24db38acd88 (patch) | |
| tree | de1c207e63bb4a65c1138273521a79c0dd35d137 /services | |
| parent | 4e5e64e76a5db351b852109dd288953a4eaaad38 (diff) | |
| parent | 67dcf032a722dab62a15b919bcf717060a2cf166 (diff) | |
| download | frameworks_av-e6ff6cd2fe5c897803d8dfc2d575c24db38acd88.zip frameworks_av-e6ff6cd2fe5c897803d8dfc2d575c24db38acd88.tar.gz frameworks_av-e6ff6cd2fe5c897803d8dfc2d575c24db38acd88.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 |