commit 2de95a59ab6042394c4f1bd0833212a793ec7393
author Treehugger Robot <treehugger-gerrit@google.com> Fri Oct 11 15:47:27 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Oct 11 15:47:27 2019 +0000
tree b44292acf617a4de89ab67da20536cff92e6ba5c
parent 0c261cc7471c6bc2449e50347aac4ab8b5489ba6
parent 0a95120c18eebd24ec72dad0508e18cea092d157

Merge "Camera: Make sure depth jpeg and result timestamps match" into android10-tests-dev

tests/camera/src/android/hardware/camera2/cts/StillCaptureTest.java

diff --git a/tests/camera/src/android/hardware/camera2/cts/StillCaptureTest.java b/tests/camera/src/android/hardware/camera2/cts/StillCaptureTest.java
index e8d2812..553ced42 100644
--- a/tests/camera/src/android/hardware/camera2/cts/StillCaptureTest.java
+++ b/tests/camera/src/android/hardware/camera2/cts/StillCaptureTest.java
@@ -1359,6 +1359,9 @@
                 resultListener.getCaptureResultForRequest(request, NUM_RESULTS_WAIT_TIMEOUT);
             Image image = imageListener.getImage(CAPTURE_IMAGE_TIMEOUT_MS);
             assertNotNull("Unable to acquire next image", image);
+            long resultTs = stillResult.get(CaptureResult.SENSOR_TIMESTAMP);
+            assertTrue("Image timestamp and result timestamp must match!",
+                    (resultTs == image.getTimestamp()));
             CameraTestUtils.validateImage(image, stillSize.getWidth(), stillSize.getHeight(),
                     format, null /*filePath*/);