diff options
| author | Zhijun He <zhijunhe@google.com> | 2014-07-22 23:29:54 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-07-22 16:13:36 +0000 |
| commit | f78cd5e5e6af5d06de15e6f91b98e648d89fc409 (patch) | |
| tree | 1d46c850753164be31c0467852ea5aa0f1e3df9c /services | |
| parent | daf92cc876a1952059794e6d0f558f0f6dd9ac8c (diff) | |
| parent | 5d76e1a639c1bae9ea7d9af1124abf1c94353344 (diff) | |
| download | frameworks_av-f78cd5e5e6af5d06de15e6f91b98e648d89fc409.zip frameworks_av-f78cd5e5e6af5d06de15e6f91b98e648d89fc409.tar.gz frameworks_av-f78cd5e5e6af5d06de15e6f91b98e648d89fc409.tar.bz2 | |
Merge "Camera3: only append partial result to partial result collection" into lmp-dev
Diffstat (limited to 'services')
| -rw-r--r-- | services/camera/libcameraservice/device3/Camera3Device.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/services/camera/libcameraservice/device3/Camera3Device.cpp b/services/camera/libcameraservice/device3/Camera3Device.cpp index 3004d3e..9d36bfa 100644 --- a/services/camera/libcameraservice/device3/Camera3Device.cpp +++ b/services/camera/libcameraservice/device3/Camera3Device.cpp @@ -1794,8 +1794,9 @@ void Camera3Device::processCaptureResult(const camera3_capture_result *result) { return; } isPartialResult = (result->partial_result < mNumPartialResults); - request.partialResult.collectedResult.append( - result->result); + if (isPartialResult) { + request.partialResult.collectedResult.append(result->result); + } } else { camera_metadata_ro_entry_t partialResultEntry; res = find_camera_metadata_ro_entry(result->result, |