Merge "Refactoring util libraries in CTS." into klp-dev
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"
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();
}