commit 403044af4352f6d56aef0fb9548d2bfce56d3127
author Shuzhen Wang <shuzhenwang@google.com> Sun Feb 26 23:29:04 2017 -0800
committer Shuzhen Wang <shuzhenwang@google.com> Fri Mar 17 10:04:28 2017 -0700
tree 9c6646efcf3b2fa54143e48401df34c1466a1a20
parent 52d0204d8fb9c293e4db67ed10b0491f006b5fbe

Camera: Fix error check for HFR timestamp

With Camera HAL sending empty metadata for HFR batching, service
shouldn't check matching timestamp for empty metadata.

Test: Manually test high speed recording
Bug: 35775704
Change-Id: I68f3c16ea9a91f15c70e406540764b02cb6951e1

services/camera/libcameraservice/device3/Camera3Device.cpp

diff --git a/services/camera/libcameraservice/device3/Camera3Device.cpp b/services/camera/libcameraservice/device3/Camera3Device.cpp
index 204f68c..71e52af 100644
--- a/services/camera/libcameraservice/device3/Camera3Device.cpp
+++ b/services/camera/libcameraservice/device3/Camera3Device.cpp
@@ -2513,8 +2513,9 @@
             (request.haveResultMetadata && shutterTimestamp != 0))) {
         ATRACE_ASYNC_END("frame capture", frameNumber);
 
-        // Sanity check - if sensor timestamp matches shutter timestamp
-        if (request.requestStatus == OK &&
+        // Sanity check - if sensor timestamp matches shutter timestamp in the
+        // case of request having callback.
+        if (request.hasCallback && request.requestStatus == OK &&
                 sensorTimestamp != shutterTimestamp) {
             SET_ERR("sensor timestamp (%" PRId64
                 ") for frame %d doesn't match shutter timestamp (%" PRId64 ")",