commit d7fbcc8f7cffe75d5708728b2762d0e165de53c3
author Michael Kwan <mkwan@google.com> Wed Nov 05 20:24:05 2014 +0000
committer android-build-merger <android-build-merger@google.com> Wed Nov 05 20:24:05 2014 +0000
tree ff419e8170affbdf09cd58e8d072da1ebc1d4f54
parent 2724145c65005c6fdc45bc4c51adce99da71a06d
parent 0c4dcb9357fd485fe9d5821597d645724a7c07b2

Merge "Added required features to location mode tests." into lmp-sprout-dev
automerge: 0c4dcb9

* commit '0c4dcb9357fd485fe9d5821597d645724a7c07b2':
  Added required features to location mode tests.

apps/CtsVerifier/AndroidManifest.xml

diff --git a/apps/CtsVerifier/AndroidManifest.xml b/apps/CtsVerifier/AndroidManifest.xml
index 7faeb76..4964e60 100644
--- a/apps/CtsVerifier/AndroidManifest.xml
+++ b/apps/CtsVerifier/AndroidManifest.xml
@@ -876,8 +876,8 @@
                 <category android:name="android.cts.intent.category.MANUAL_TEST" />
             </intent-filter>
             <meta-data android:name="test_category" android:value="@string/test_category_location" />
-            <meta-data android:name="test_excluded_features"
-                       android:value="android.hardware.type.television:android.software.leanback:android.hardware.type.watch" />
+            <meta-data android:name="test_required_features"
+                    android:value="android.hardware.location.network:android.hardware.location.gps" />
         </activity>
         <activity android:name=".location.LocationModeBatterySavingTestActivity"
                 android:label="@string/location_mode_battery_saving_test">
@@ -886,8 +886,7 @@
                 <category android:name="android.cts.intent.category.MANUAL_TEST" />
             </intent-filter>
             <meta-data android:name="test_category" android:value="@string/test_category_location" />
-            <meta-data android:name="test_excluded_features"
-                    android:value="android.hardware.type.watch" />
+            <meta-data android:name="test_required_features" android:value="android.hardware.location.network" />
         </activity>
         <activity android:name=".location.LocationModeDeviceOnlyTestActivity"
                 android:label="@string/location_mode_device_only_test">
@@ -896,8 +895,7 @@
                 <category android:name="android.cts.intent.category.MANUAL_TEST" />
             </intent-filter>
             <meta-data android:name="test_category" android:value="@string/test_category_location" />
-            <meta-data android:name="test_excluded_features"
-                       android:value="android.hardware.type.television:android.software.leanback" />
+            <meta-data android:name="test_required_features" android:value="android.hardware.location.gps" />
         </activity>
 
         <activity android:name=".camera.formats.CameraFormatsActivity"