commit 6aae4fecd715ed7959a36bed9a2ad276bcfd2020
author Daniel Xie <dxie@google.com> Tue Oct 13 02:39:50 2015 +0000
committer android-build-merger <android-build-merger@google.com> Tue Oct 13 02:39:50 2015 +0000
tree bc3b4392f6f47f5de1654e89e972940a484853e4
parent cff8ca06301d51b324f779f5049eb3de509a0d84
parent b3310a605429b5d76d23863998cd16936269d51b

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

* commit 'b3310a605429b5d76d23863998cd16936269d51b':
  Camera: fix wrong assertion logic

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 " +