summaryrefslogtreecommitdiffstats
path: root/camera/device
diff options
context:
space:
mode:
authorandroid-build-team Robot <android-build-team-robot@google.com>2018-05-03 10:33:09 -0700
committerandroid-build-merger <android-build-merger@google.com>2018-05-03 10:33:09 -0700
commitcf20daebcb168f76775a11307c7e529079346fbe (patch)
tree826e81c7b639efb821508d342b540386fbb2c8c0 /camera/device
parent93df7cf51341170a2c77f879a536356b86e54fed (diff)
parent33ad1e6aa19e0bd87c627ffc076066771937c552 (diff)
downloadandroid_hardware_interfaces-cf20daebcb168f76775a11307c7e529079346fbe.tar.gz
android_hardware_interfaces-cf20daebcb168f76775a11307c7e529079346fbe.tar.bz2
android_hardware_interfaces-cf20daebcb168f76775a11307c7e529079346fbe.zip
Merge "Camera: Set partial results in result batcher" into pi-dev
am: 33ad1e6aa1 Change-Id: I632f43b7e378ad1bda505d8c1f06a16f3c487868
Diffstat (limited to 'camera/device')
-rw-r--r--camera/device/3.4/default/CameraDeviceSession.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/camera/device/3.4/default/CameraDeviceSession.cpp b/camera/device/3.4/default/CameraDeviceSession.cpp
index 550d65a88..9722c75db 100644
--- a/camera/device/3.4/default/CameraDeviceSession.cpp
+++ b/camera/device/3.4/default/CameraDeviceSession.cpp
@@ -52,6 +52,8 @@ CameraDeviceSession::CameraDeviceSession(
}
}
+ mResultBatcher_3_4.setNumPartialResults(mNumPartialResults);
+
camera_metadata_entry_t capabilities =
mDeviceInfo.find(ANDROID_REQUEST_AVAILABLE_CAPABILITIES);
bool isLogicalMultiCamera = false;