Fix cts verifier manifest.
The sensor related tests are incorrectly using multiple "test_applicable_features"
to indicate that a test should be restricted to devices with certain features.
Instead, a single "test_applicable_features" must be used with ":" delimited
feature names
Change-Id: I39b719fcffff1a9ece9303165167f1dd1fe6c98d
diff --git a/apps/CtsVerifier/AndroidManifest.xml b/apps/CtsVerifier/AndroidManifest.xml
index e6e275d..12ed5e5 100644
--- a/apps/CtsVerifier/AndroidManifest.xml
+++ b/apps/CtsVerifier/AndroidManifest.xml
@@ -799,13 +799,7 @@
</intent-filter>
<meta-data android:name="test_category" android:value="@string/test_category_sensors" />
<meta-data android:name="test_applicable_features"
- android:value="android.hardware.sensor.stepcounter" />
- <meta-data android:name="test_applicable_features"
- android:value="android.hardware.sensor.stepdetector" />
- <meta-data android:name="test_applicable_features"
- android:value="android.hardware.sensor.proximity" />
- <meta-data android:name="test_applicable_features"
- android:value="android.hardware.sensor.light" />
+ android:value="android.hardware.sensor.stepcounter:android.hardware.sensor.stepdetector:android.hardware.sensor.proximity:android.hardware.sensor.light" />
</activity>
<!-- TODO: enable when a more reliable way to identify time synchronization is available -->
@@ -830,13 +824,7 @@
</intent-filter>
<meta-data android:name="test_category" android:value="@string/test_category_sensors"/>
<meta-data android:name="test_applicable_features"
- android:value="android.hardware.sensor.accelerometer" />
- <meta-data android:name="test_applicable_features"
- android:value="android.hardware.sensor.compass" />
- <meta-data android:name="test_applicable_features"
- android:value="android.hardware.sensor.gyroscope" />
- <meta-data android:name="test_applicable_features"
- android:value="android.hardware.sensor.barometer" />
+ android:value="android.hardware.sensor.accelerometer:android.hardware.sensor.compass:android.hardware.sensor.gyroscope:android.hardware.sensor.barometer" />
</activity>
<activity android:name=".sensors.SensorBatchingTestsActivity"
@@ -848,13 +836,7 @@
</intent-filter>
<meta-data android:name="test_category" android:value="@string/test_category_sensors"/>
<meta-data android:name="test_applicable_features"
- android:value="android.hardware.sensor.accelerometer" />
- <meta-data android:name="test_applicable_features"
- android:value="android.hardware.sensor.compass" />
- <meta-data android:name="test_applicable_features"
- android:value="android.hardware.sensor.gyroscope" />
- <meta-data android:name="test_applicable_features"
- android:value="android.hardware.sensor.barometer" />
+ android:value="android.hardware.sensor.accelerometer:android.hardware.sensor.compass:android.hardware.sensor.gyroscope:android.hardware.sensor.barometer" />
</activity>
<activity android:name=".sensors.SensorIntegrationTestsActivity"
@@ -866,11 +848,7 @@
</intent-filter>
<meta-data android:name="test_category" android:value="@string/test_category_sensors"/>
<meta-data android:name="test_applicable_features"
- android:value="android.hardware.sensor.accelerometer" />
- <meta-data android:name="test_applicable_features"
- android:value="android.hardware.sensor.compass" />
- <meta-data android:name="test_applicable_features"
- android:value="android.hardware.sensor.gyroscope" />
+ android:value="android.hardware.sensor.accelerometer:android.hardware.sensor.compass:android.hardware.sensor.gyroscope" />
</activity>
<activity android:name=".sensors.SensorTestActivity"
@@ -882,17 +860,7 @@
</intent-filter>
<meta-data android:name="test_category" android:value="@string/test_category_sensors"/>
<meta-data android:name="test_applicable_features"
- android:value="android.hardware.sensor.accelerometer" />
- <meta-data android:name="test_applicable_features"
- android:value="android.hardware.sensor.stepcounter" />
- <meta-data android:name="test_applicable_features"
- android:value="android.hardware.sensor.stepdetector" />
- <meta-data android:name="test_applicable_features"
- android:value="android.hardware.sensor.heartrate" />
- <meta-data android:name="test_applicable_features"
- android:value="android.hardware.sensor.compass" />
- <meta-data android:name="test_applicable_features"
- android:value="android.hardware.sensor.ambient_temperature" />
+ android:value="android.hardware.sensor.accelerometer:android.hardware.sensor.stepcounter:android.hardware.sensor.stepdetector:android.hardware.sensor.heartrate:android.hardware.sensor.compass:android.hardware.sensor.ambient_temperature" />
</activity>
<!-- End sensor tests definitions -->