commit d9b70d69afebb04c60ea6a69b6bfed95bc594e28
author Takeshi Oishi <Takeshi.Oishi@jp.sony.com> Fri Mar 31 00:29:03 2017 +0000
committer android-build-merger <android-build-merger@google.com> Fri Mar 31 00:29:03 2017 +0000
tree 75825fdae14ad02bba9645edb744d50baac6d294
parent 966ef4d3ad279f58f2fe9e49e7bd6c3e3da14e4b
parent 12c21a1d41f406d2e1ebd468819d0ec393ebdc28

Merge "Corrected condition for Audio Frequency Unprocessed Test in CTS Verifier" into nougat-cts-dev
am: 12c21a1d41

Change-Id: I13a8d555fc24e23c87672030ef362974d2d1ac2b

apps/CtsVerifier/AndroidManifest.xml

diff --git a/apps/CtsVerifier/AndroidManifest.xml b/apps/CtsVerifier/AndroidManifest.xml
index 38c15bd..475a95b 100644
--- a/apps/CtsVerifier/AndroidManifest.xml
+++ b/apps/CtsVerifier/AndroidManifest.xml
@@ -2094,8 +2094,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.usb.host" />
+            <meta-data android:name="test_required_features" android:value="android.hardware.microphone:android.hardware.usb.host" />
         </activity>
 
         <service android:name=".tv.MockTvInputService"