diff options
Diffstat (limited to 'apps/CtsVerifier/AndroidManifest.xml')
| -rw-r--r-- | apps/CtsVerifier/AndroidManifest.xml | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/apps/CtsVerifier/AndroidManifest.xml b/apps/CtsVerifier/AndroidManifest.xml index 7f2ba711775..f2640e51b3f 100644 --- a/apps/CtsVerifier/AndroidManifest.xml +++ b/apps/CtsVerifier/AndroidManifest.xml @@ -215,7 +215,7 @@ <meta-data android:name="test_required_features" android:value="android.software.device_admin" /> <meta-data android:name="test_excluded_features" - android:value="android.hardware.type.watch" /> + android:value="android.hardware.type.watch:android.hardware.type.automotive" /> </activity> <activity android:name=".admin.ScreenLockTestActivity" @@ -3099,8 +3099,7 @@ <category android:name="android.cts.intent.category.MANUAL_TEST" /> </intent-filter> <meta-data android:name="test_category" android:value="@string/test_category_audio" /> - <meta-data android:name="test_required_features" android:value="android.hardware.microphone" /> - <meta-data android:name="test_required_features" android:value="android.hardware.audio.output" /> + <meta-data android:name="test_required_features" android:value="android.hardware.microphone:android.hardware.audio.output" /> <meta-data android:name="test_excluded_features" android:value="android.hardware.type.watch:android.hardware.type.television" /> </activity> @@ -3112,8 +3111,7 @@ <category android:name="android.cts.intent.category.MANUAL_TEST" /> </intent-filter> <meta-data android:name="test_category" android:value="@string/test_category_audio" /> - <meta-data android:name="test_required_features" android:value="android.hardware.microphone" /> - <meta-data android:name="test_required_features" android:value="android.hardware.audio.output" /> + <meta-data android:name="test_required_features" android:value="android.hardware.microphone:android.hardware.audio.output" /> </activity> <activity android:name=".audio.AudioFrequencySpeakerActivity" @@ -3123,8 +3121,7 @@ <category android:name="android.cts.intent.category.MANUAL_TEST" /> </intent-filter> <meta-data android:name="test_category" android:value="@string/test_category_audio" /> - <meta-data android:name="test_required_features" android:value="android.hardware.audio.output" /> - <meta-data android:name="test_required_features" android:value="android.hardware.usb.host" /> + <meta-data android:name="test_required_features" android:value="android.hardware.audio.output:android.hardware.usb.host" /> </activity> <activity android:name=".audio.AudioFrequencyMicActivity" @@ -3134,9 +3131,7 @@ <category android:name="android.cts.intent.category.MANUAL_TEST" /> </intent-filter> <meta-data android:name="test_category" android:value="@string/test_category_audio" /> - <meta-data android:name="test_required_features" android:value="android.hardware.microphone" /> - <meta-data android:name="test_required_features" android:value="android.hardware.audio.output" /> - <meta-data android:name="test_required_features" android:value="android.hardware.usb.host" /> + <meta-data android:name="test_required_features" android:value="android.hardware.microphone:android.hardware.audio.output:android.hardware.usb.host" /> </activity> <activity android:name=".audio.AudioFrequencyUnprocessedActivity" |