commit 541b4a1200c18616d9469a71ba7f6e4a12186fc9
author Kazuhiro Inaba <kinaba@google.com> Fri Jun 15 14:07:29 2018 +0900
committer Kazuhiro Inaba <kinaba@google.com> Fri Jun 22 21:45:39 2018 +0900
tree 5daf327d911b9b4a74cd841764eb260736873ad5
parent 38291f7561b3a3cd94f90b79643c5adad5e19f68

CtsVerifier: Emergency call test should require "telephony" as prerequisite.

Devices without telephony support don't have the emergency call
feature at all, hence the tests need not run.

Bug: 78306452
Test: "Emergency Call *** Test" should not appear in CtsVerifier
Change-Id: Ib6bc9a8c25133c995f68151f374c4b4f933f99c0
Merged-In: Ib6bc9a8c25133c995f68151f374c4b4f933f99c0

apps/CtsVerifier/AndroidManifest.xml

diff --git a/apps/CtsVerifier/AndroidManifest.xml b/apps/CtsVerifier/AndroidManifest.xml
index 514db87a..1eba04c 100644
--- a/apps/CtsVerifier/AndroidManifest.xml
+++ b/apps/CtsVerifier/AndroidManifest.xml
@@ -1203,8 +1203,8 @@
                 <category android:name="android.cts.intent.category.MANUAL_TEST"/>
             </intent-filter>
             <meta-data android:name="test_category" android:value="@string/test_category_hardware"/>
-            <meta-data android:name="test_required_features" android:value="android.hardware.location.gps" />
-            <meta-data android:name="test_required_features" android:value="android.hardware.wifi" />
+            <meta-data android:name="test_required_features"
+                       android:value="android.hardware.location.gps:android.hardware.wifi:android.hardware.telephony"/>
         </activity>
 
         <activity android:name=".location.EmergencyCallMessageTestsActivity"
@@ -1215,9 +1215,8 @@
                 <category android:name="android.cts.intent.category.MANUAL_TEST"/>
             </intent-filter>
             <meta-data android:name="test_category" android:value="@string/test_category_hardware"/>
-            <meta-data android:name="test_required_features" android:value="android.hardware.location.gps" />
-            <meta-data android:name="test_required_features" android:value="android.hardware.wifi" />
-            <meta-data android:name="test_required_features" android:value="android.hardware.telephony"/>
+            <meta-data android:name="test_required_features"
+                       android:value="android.hardware.location.gps:android.hardware.wifi:android.hardware.telephony"/>
         </activity>
 
         <activity android:name=".location.EmergencyCallGNSSTestsActivity"
@@ -1228,8 +1227,8 @@
                 <category android:name="android.cts.intent.category.MANUAL_TEST"/>
             </intent-filter>
             <meta-data android:name="test_category" android:value="@string/test_category_hardware"/>
-            <meta-data android:name="test_required_features" android:value="android.hardware.location.gps" />
-            <meta-data android:name="test_required_features" android:value="android.hardware.wifi" />
+            <meta-data android:name="test_required_features"
+                       android:value="android.hardware.location.gps:android.hardware.wifi:android.hardware.telephony"/>
         </activity>
 
         <activity android:name=".location.GnssMeasurementWhenNoLocationTestsActivity"