remove network location provider from default config

android.hardware.location.network is only available if
Network Location Provider is available. Not all configurations
that include gps have NLP, so this should be removed from
default configuration files. For devices that have NLP
android.hardware.location.network.xml should be installed.

Change-Id: I3a25c5687dbae62972fac1bd789a67c81e00d8b8
Original-Change-Id: Iab06f0fff3f109eee24186548f2624e0a97f2104
Signed-off-by: Irina Tirdea <irina.tirdea@intel.com>

diff --git a/data/etc/android.hardware.location.gps.xml b/data/etc/android.hardware.location.gps.xml
index 72ab732..d13dd5e 100644 (file)
--- a/data/etc/android.hardware.location.gps.xml
+++ b/data/etc/android.hardware.location.gps.xml
@@ -17,6 +17,7 @@
 <!-- These are the location-related features for devices that include GPS. -->
 <permissions>
     <feature name="android.hardware.location" />
-    <feature name="android.hardware.location.network" />
     <feature name="android.hardware.location.gps" />
+    <!-- devices with Network Location Provider  must include
+         android.hardware.location.xml -->
 </permissions>

diff --git a/data/etc/tablet_core_hardware.xml b/data/etc/tablet_core_hardware.xml
index 78b9736..90b9fc6 100644 (file)
--- a/data/etc/tablet_core_hardware.xml
+++ b/data/etc/tablet_core_hardware.xml
@@ -24,7 +24,6 @@
 -->
 <permissions>
     <feature name="android.hardware.location" />
-    <feature name="android.hardware.location.network" />
     <feature name="android.hardware.sensor.compass" />
     <feature name="android.hardware.sensor.accelerometer" />
     <feature name="android.hardware.bluetooth" />
@@ -40,6 +39,8 @@
     <!-- Feature to specify if the device supports adding device admins. -->
     <feature name="android.software.device_admin" />
     <!-- devices with GPS must include android.hardware.location.gps.xml -->
+    <!-- devices with Network Location Provider  must include
+         android.hardware.location.xml -->
     <!-- devices with a rear-facing camera must include one of these as appropriate:
          android.hardware.camera.xml or 
          android.hardware.camera.autofocus.xml or