commit 7ef71cb858e7471e712d2fe0fe536bb9028f3ec6
author Stuart Scott <stuartscott@google.com> Thu Nov 14 00:29:14 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Nov 14 00:29:14 2013 +0000
tree 03b7277210e4d6f5b5b9b58ef12461d0bca52a55
parent a8ad3f8636f158f234d3d4c7cc7f1d01f1f95d66
parent a1f2d058abad4484f485c6c7fa7bcc940005e8b9

Merge "Refactoring util libraries in CTS." into klp-dev

apps/CtsVerifier/AndroidManifest.xml

diff --git a/apps/CtsVerifier/AndroidManifest.xml b/apps/CtsVerifier/AndroidManifest.xml
index ff79003..9a583ef 100644
--- a/apps/CtsVerifier/AndroidManifest.xml
+++ b/apps/CtsVerifier/AndroidManifest.xml
@@ -451,7 +451,8 @@
                        android:value="android.hardware.sensor.gyroscope"/>
         </activity>
 
-        <activity android:name=".sensors.MagneticFieldMeasurementTestActivity"
+        <!-- Disable the test until calibration routine is verified -->
+        <!--activity android:name=".sensors.MagneticFieldMeasurementTestActivity"
                   android:label="@string/snsr_mag_m_test"
                   android:screenOrientation="nosensor">
             <intent-filter>
@@ -461,7 +462,7 @@
             <meta-data android:name="test_category" android:value="@string/test_category_sensors" />
             <meta-data android:name="test_required_features"
                        android:value="android.hardware.sensor.compass" />
-        </activity>
+        </activity-->
 
         <activity android:name=".camera.formats.CameraFormatsActivity"
                  android:label="@string/camera_format"

apps/CtsVerifier/src/com/android/cts/verifier/sensors/AccelerometerMeasurementTestActivity.java

diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/sensors/AccelerometerMeasurementTestActivity.java b/apps/CtsVerifier/src/com/android/cts/verifier/sensors/AccelerometerMeasurementTestActivity.java
index 0ad86bc..bcd00ed 100644
--- a/apps/CtsVerifier/src/com/android/cts/verifier/sensors/AccelerometerMeasurementTestActivity.java
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/sensors/AccelerometerMeasurementTestActivity.java
@@ -80,7 +80,7 @@
                 SensorManager.SENSOR_DELAY_FASTEST,
                 0 /*reportLatencyInUs*/,
                 expectations,
-                0.7f /* m / s^2 */);
+                1.95f /* m / s^2 */);
         verifyMeasurements.execute();
         logSuccess();
     }