diff options
author | Alex Ray <aray@google.com> | 2014-04-15 12:37:58 -0700 |
---|---|---|
committer | Bill Yi <byi@google.com> | 2014-06-17 14:19:44 -0700 |
commit | c070509a4a48d64c12d18400da8675538f4a666a (patch) | |
tree | 125c1bc94b5e2df42e9ce968a3c5ed5b26b577d1 | |
parent | 1856a4ef10530ae3058e077e2c7101b4c27ae3b6 (diff) | |
download | cts-c070509a4a48d64c12d18400da8675538f4a666a.tar.gz |
hardware: consumerir: Fix time discrepancy
Calculate target elapsed time in nanoseconds, because the elapsed time
measurement is given in nanoseconds.
Bug: 14057146
Change-Id: Idde2e6a855c0edaba072029fff1d8838f5a31ae1
Signed-off-by: Alex Ray <aray@google.com>
-rw-r--r-- | tests/tests/hardware/src/android/hardware/consumerir/cts/ConsumerIrTest.java | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/tests/tests/hardware/src/android/hardware/consumerir/cts/ConsumerIrTest.java b/tests/tests/hardware/src/android/hardware/consumerir/cts/ConsumerIrTest.java index 395a69b6ac4..d88521ed222 100644 --- a/tests/tests/hardware/src/android/hardware/consumerir/cts/ConsumerIrTest.java +++ b/tests/tests/hardware/src/android/hardware/consumerir/cts/ConsumerIrTest.java @@ -78,9 +78,9 @@ public class ConsumerIrTest extends AndroidTestCase { ConsumerIrManager.CarrierFrequencyRange[] freqs = mCIR.getCarrierFrequencies(); // Transmit two seconds for min and max for each frequency range int[] pattern = {1111, 2222, 3333, 4444, 5555, 6666, 7777, 8888, 9999}; - long totalXmitTime = 0; // get the length of the pattern + long totalXmitTimeNanos = 0; // get the length of the pattern for (int slice : pattern) { - totalXmitTime += slice; + totalXmitTimeNanos += slice * 1000; // add the time in nanoseconds } double margin = 0.1; // max fraction xmit is allowed to be off timing @@ -90,18 +90,18 @@ public class ConsumerIrTest extends AndroidTestCase { mCIR.transmit(range.getMinFrequency(), pattern); long newTime = SystemClock.elapsedRealtimeNanos(); String msg = String.format("Pattern length pattern:%d, actual:%d", - totalXmitTime, newTime - currentTime); - assertTrue(msg, newTime - currentTime >= totalXmitTime * (1.0 - margin)); - assertTrue(msg, newTime - currentTime <= totalXmitTime * (1.0 + margin)); + totalXmitTimeNanos, newTime - currentTime); + assertTrue(msg, newTime - currentTime >= totalXmitTimeNanos * (1.0 - margin)); + assertTrue(msg, newTime - currentTime <= totalXmitTimeNanos * (1.0 + margin)); // test max freq currentTime = SystemClock.elapsedRealtimeNanos(); mCIR.transmit(range.getMaxFrequency(), pattern); newTime = SystemClock.elapsedRealtimeNanos(); msg = String.format("Pattern length pattern:%d, actual:%d", - totalXmitTime, newTime - currentTime); - assertTrue(msg, newTime - currentTime >= totalXmitTime * (1.0 - margin)); - assertTrue(msg, newTime - currentTime <= totalXmitTime * (1.0 + margin)); + totalXmitTimeNanos, newTime - currentTime); + assertTrue(msg, newTime - currentTime >= totalXmitTimeNanos * (1.0 - margin)); + assertTrue(msg, newTime - currentTime <= totalXmitTimeNanos * (1.0 + margin)); } } |