commit | 58330528140aba4d9005c98f7a02eedc46ef0ffa | [log] [tgz] |
---|---|---|
author | Aniroop Mathur <aniroop.mathur@gmail.com> | Wed Sep 16 15:56:26 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Sep 16 15:56:26 2015 +0000 |
tree | b8fdcec988ee4daa0a392dc800e8710616f4f005 | |
parent | 1056d832452832489c85e384702a3d4d5f61dd40 [diff] | |
parent | a6cc0a8232f9e192a88455a33f687e339d6b8da3 [diff] |
am a6cc0a82: Merge "CTS: Add check for same sensor event timestamp" into lollipop-cts-dev * commit 'a6cc0a8232f9e192a88455a33f687e339d6b8da3': CTS: Add check for same sensor event timestamp
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; } }