commit a6cc0a8232f9e192a88455a33f687e339d6b8da3
author Aniroop Mathur <aniroop.mathur@gmail.com> Tue Jul 14 20:39:06 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Jul 14 20:39:07 2015 +0000
tree a7b16819ae027872b0ee960263508c5784577862
parent 38c069980f19aeaa2e202554fab4a453344ca06e
parent 444ccdd626cfbe0cc7458303eb0e7f46e123c5dd

Merge "CTS: Add check for same sensor event timestamp" into lollipop-cts-dev

tests/tests/hardware/src/android/hardware/cts/helpers/sensorverification/EventOrderingVerification.java

diff --git a/tests/tests/hardware/src/android/hardware/cts/helpers/sensorverification/EventOrderingVerification.java b/tests/tests/hardware/src/android/hardware/cts/helpers/sensorverification/EventOrderingVerification.java
index 6598725..31974c6 100644
--- a/tests/tests/hardware/src/android/hardware/cts/helpers/sensorverification/EventOrderingVerification.java
+++ b/tests/tests/hardware/src/android/hardware/cts/helpers/sensorverification/EventOrderingVerification.java
@@ -117,9 +117,9 @@
         if (mPreviousEvent == null) {
             mMaxTimestamp = event.timestamp;
         } else {
-            if (event.timestamp < mMaxTimestamp) {
+            if (event.timestamp <= mMaxTimestamp) {
                 mOutOfOrderEvents.add(new IndexedEventPair(mIndex, event, mPreviousEvent));
-            } else if (event.timestamp > mMaxTimestamp) {
+            } else {
                 mMaxTimestamp = event.timestamp;
             }
         }