commit b3310a605429b5d76d23863998cd16936269d51b
author Daniel Xie <dxie@google.com> Tue Oct 13 02:38:47 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Oct 13 02:38:47 2015 +0000
tree 903244aa3a95b0d43a7dbc7d34e5e01ad54d701c
parent fbef4e7b746f7e074278ca3e31db88fa3a836ca2
parent e272993a959da0ff8ea741fc7e02f0a97c40f35a

Merge "Camera: fix wrong assertion logic" into marshmallow-cts-dev

tests/tests/hardware/src/android/hardware/camera2/cts/ImageReaderTest.java

diff --git a/tests/tests/hardware/src/android/hardware/camera2/cts/ImageReaderTest.java b/tests/tests/hardware/src/android/hardware/camera2/cts/ImageReaderTest.java
index 155f9dd..f1115c4 100644
--- a/tests/tests/hardware/src/android/hardware/camera2/cts/ImageReaderTest.java
+++ b/tests/tests/hardware/src/android/hardware/camera2/cts/ImageReaderTest.java
@@ -794,7 +794,7 @@
                                     getValueNotNull(result, CaptureResult.SENSOR_EXPOSURE_TIME),
                                     TEST_EXPOSURE_TIME_NS),
                             exposureTimeDiff < EXPOSURE_TIME_ERROR_MARGIN_NS &&
-                            exposureTimeDiff > 0);
+                            exposureTimeDiff >= 0);
 
                     mCollector.expectTrue(
                             String.format("Long processing frame %d format %d size %s " +