commit 9efd79120b27b2914351e67bdb01be3cfe38f100
author Eric Rowe <erowe@google.com> Thu Mar 13 19:08:04 2014 -0700
committer Eric Rowe <erowe@google.com> Wed May 07 22:31:41 2014 +0000
tree 6643b8f24dc543675f81ef3c6ecc7e4a4be90411
parent b306b537fa69abbe3ae9fb9187ac1ba37a44a3a0

Tighten sensor expectations

Change-Id: Id62c81e1697f2f8bcd7890c31beb4f2df35f7ac6

tests/tests/hardware/src/android/hardware/cts/helpers/sensoroperations/VerifySensorOperation.java

diff --git a/tests/tests/hardware/src/android/hardware/cts/helpers/sensoroperations/VerifySensorOperation.java b/tests/tests/hardware/src/android/hardware/cts/helpers/sensoroperations/VerifySensorOperation.java
index e2d7c40..7e4cab7 100644
--- a/tests/tests/hardware/src/android/hardware/cts/helpers/sensoroperations/VerifySensorOperation.java
+++ b/tests/tests/hardware/src/android/hardware/cts/helpers/sensoroperations/VerifySensorOperation.java
@@ -211,25 +211,17 @@
 
         // sensorType: lowerThreshold, upperThreshold (% of expected frequency)
         Map<Integer, int[]> defaults = new HashMap<Integer, int[]>(12);
-        // Sensors that we don't want to test at this time but still want to record the values.
-        defaults.put(Sensor.TYPE_ACCELEROMETER, new int[]{Integer.MAX_VALUE, Integer.MAX_VALUE});
-        defaults.put(Sensor.TYPE_MAGNETIC_FIELD, new int[]{Integer.MAX_VALUE, Integer.MAX_VALUE});
-        defaults.put(Sensor.TYPE_GYROSCOPE, new int[]{Integer.MAX_VALUE, Integer.MAX_VALUE});
-        defaults.put(Sensor.TYPE_ORIENTATION, new int[]{Integer.MAX_VALUE, Integer.MAX_VALUE});
-        defaults.put(Sensor.TYPE_PRESSURE, new int[]{Integer.MAX_VALUE, Integer.MAX_VALUE});
-        defaults.put(Sensor.TYPE_GRAVITY, new int[]{Integer.MAX_VALUE, Integer.MAX_VALUE});
-        defaults.put(Sensor.TYPE_LINEAR_ACCELERATION,
-                new int[]{Integer.MAX_VALUE, Integer.MAX_VALUE});
-        defaults.put(Sensor.TYPE_ROTATION_VECTOR,
-                new int[]{Integer.MAX_VALUE, Integer.MAX_VALUE});
-        defaults.put(Sensor.TYPE_MAGNETIC_FIELD_UNCALIBRATED,
-                new int[]{Integer.MAX_VALUE, Integer.MAX_VALUE});
-        defaults.put(Sensor.TYPE_GAME_ROTATION_VECTOR,
-                new int[]{Integer.MAX_VALUE, Integer.MAX_VALUE});
-        defaults.put(Sensor.TYPE_GYROSCOPE_UNCALIBRATED,
-                new int[]{Integer.MAX_VALUE, Integer.MAX_VALUE});
-        defaults.put(Sensor.TYPE_GEOMAGNETIC_ROTATION_VECTOR,
-                new int[]{Integer.MAX_VALUE, Integer.MAX_VALUE});
+        defaults.put(Sensor.TYPE_ACCELEROMETER, DEFAULT_FREQUENCY_THRESHOLDS);
+        defaults.put(Sensor.TYPE_MAGNETIC_FIELD, DEFAULT_FREQUENCY_THRESHOLDS);
+        defaults.put(Sensor.TYPE_GYROSCOPE, DEFAULT_FREQUENCY_THRESHOLDS);
+        defaults.put(Sensor.TYPE_ORIENTATION, DEFAULT_FREQUENCY_THRESHOLDS);
+        defaults.put(Sensor.TYPE_PRESSURE, DEFAULT_FREQUENCY_THRESHOLDS);
+        defaults.put(Sensor.TYPE_GRAVITY, DEFAULT_FREQUENCY_THRESHOLDS);
+        defaults.put(Sensor.TYPE_LINEAR_ACCELERATION, DEFAULT_FREQUENCY_THRESHOLDS);
+        defaults.put(Sensor.TYPE_ROTATION_VECTOR, DEFAULT_FREQUENCY_THRESHOLDS);
+        defaults.put(Sensor.TYPE_MAGNETIC_FIELD_UNCALIBRATED, DEFAULT_FREQUENCY_THRESHOLDS);
+        defaults.put(Sensor.TYPE_GAME_ROTATION_VECTOR, DEFAULT_FREQUENCY_THRESHOLDS);
+        defaults.put(Sensor.TYPE_GYROSCOPE_UNCALIBRATED, DEFAULT_FREQUENCY_THRESHOLDS);
 
         if (defaults.containsKey(mSensorType)) {
             // Expected frequency in Hz