summaryrefslogtreecommitdiffstats
path: root/apps/CtsVerifier/AndroidManifest.xml
diff options
context:
space:
mode:
authorTreehugger Robot <treehugger-gerrit@google.com>2017-03-22 07:17:20 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2017-03-22 07:17:21 +0000
commit06971fee3ea30521c23694dabbf48725dbff373b (patch)
treed4183f8740f8160ce0933e7c258302b88a3dd5a9 /apps/CtsVerifier/AndroidManifest.xml
parentbcc6e62e06bea2158dccffb53e6aef251383a284 (diff)
parent3fb1af4af7eab0683e08f09846c40e36b2d15cf8 (diff)
downloadplatform_cts-06971fee3ea30521c23694dabbf48725dbff373b.tar.gz
platform_cts-06971fee3ea30521c23694dabbf48725dbff373b.tar.bz2
platform_cts-06971fee3ea30521c23694dabbf48725dbff373b.zip
Merge "Exclude Charging Constraints test, if “android.hardware.type.automotive” is declared." into marshmallow-cts-dev
Diffstat (limited to 'apps/CtsVerifier/AndroidManifest.xml')
-rw-r--r--apps/CtsVerifier/AndroidManifest.xml4
1 files changed, 1 insertions, 3 deletions
diff --git a/apps/CtsVerifier/AndroidManifest.xml b/apps/CtsVerifier/AndroidManifest.xml
index 1193c0cec8a..95e448577d6 100644
--- a/apps/CtsVerifier/AndroidManifest.xml
+++ b/apps/CtsVerifier/AndroidManifest.xml
@@ -1651,9 +1651,7 @@
</intent-filter>
<meta-data android:name="test_category" android:value="@string/test_category_jobscheduler" />
<meta-data android:name="test_excluded_features"
- android:value="android.hardware.type.television" />
- <meta-data android:name="test_excluded_features"
- android:value="android.software.leanback" />
+ android:value="android.hardware.type.television:android.software.leanback:android.hardware.type.automotive" />
</activity>
<activity android:name=".jobscheduler.ConnectivityConstraintTestActivity" android:label="@string/js_connectivity_test">