summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZhijun He <zhijunhe@google.com>2014-07-22 16:08:13 -0700
committerZhijun He <zhijunhe@google.com>2014-07-22 16:08:13 -0700
commit5d76e1a639c1bae9ea7d9af1124abf1c94353344 (patch)
treed1a03e4f590b62923a460f5435cdaa1c0929ab6a
parenteeaf40a8e413780bd2aacde172ac820e2ce12eb3 (diff)
downloadframeworks_av-5d76e1a639c1bae9ea7d9af1124abf1c94353344.zip
frameworks_av-5d76e1a639c1bae9ea7d9af1124abf1c94353344.tar.gz
frameworks_av-5d76e1a639c1bae9ea7d9af1124abf1c94353344.tar.bz2
Camera3: only append partial result to partial result collection
Otherwise, the metadata entries will be duplicated. Change-Id: If0cd96e09960fdf746a70913d380e9036745a944
-rw-r--r--services/camera/libcameraservice/device3/Camera3Device.cpp5
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,