commit bc7c5411d6fdd81ad8705db48cfa69b1bc3ff4e0
author android-build-team Robot <android-build-team-robot@google.com> Tue Apr 07 23:14:50 2020 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Tue Apr 07 23:14:50 2020 +0000
tree 8edbc85b977a3b36a36adae7e882a7088e7d8fc3
parent 8236194904ccd415096c655999575c147b58fc27
parent 8e7be728199c9123744860ce80921fb605501c61

Snap for 6373393 from 8e7be728199c9123744860ce80921fb605501c61 to qt-qpr3-release

Change-Id: I139a49e004d31c1b3d23a957687a600b2aade901

services/camera/libcameraservice/device3/Camera3Device.cpp

diff --git a/services/camera/libcameraservice/device3/Camera3Device.cpp b/services/camera/libcameraservice/device3/Camera3Device.cpp
index 4227a3b..93e18cf 100644
--- a/services/camera/libcameraservice/device3/Camera3Device.cpp
+++ b/services/camera/libcameraservice/device3/Camera3Device.cpp
@@ -3529,6 +3529,8 @@
                 frameNumber);
         return;
     }
+    nsecs_t sensorTimestamp = timestamp.data.i64[0];
+
     for (auto& physicalMetadata : captureResult.mPhysicalMetadatas) {
         camera_metadata_entry timestamp =
                 physicalMetadata.mPhysicalCameraMetadata.find(ANDROID_SENSOR_TIMESTAMP);
@@ -3583,7 +3585,7 @@
                 CameraMetadata(m.mPhysicalCameraMetadata));
     }
     mTagMonitor.monitorMetadata(TagMonitor::RESULT,
-            frameNumber, timestamp.data.i64[0], captureResult.mMetadata,
+            frameNumber, sensorTimestamp, captureResult.mMetadata,
             monitoredPhysicalMetadata);
 
     insertResultLocked(&captureResult, frameNumber);