Merge "Changes to support updating location providers." into jb-mr1-dev

Author: jham

core/res/res/values/config.xml

@@ -636,19 +636,12 @@
          of new location providers at run-time. The new package does not
          have to be explicitly listed here, however it must have a signature
          that matches the signature of at least one package on this list.
-         Platforms should overlay additional packages in
-         config_overlay_locationProviderPackageNames, instead of overlaying
-         this config, if they only want to append packages and not replace
-         the entire array.
          -->
     <string-array name="config_locationProviderPackageNames" translatable="false">
+        <!-- The standard AOSP fused location provider -->
         <item>com.android.location.fused</item>
     </string-array>
 
-    <!-- Pacakge name(s) supplied by overlay, and appended to
-         config_locationProviderPackageNames. -->
-    <string-array name="config_overlay_locationProviderPackageNames" translatable="false" />
-
     <!-- Boolean indicating if current platform supports bluetooth SCO for off call
     use cases -->
     <bool name="config_bluetooth_sco_off_call">true</bool>

core/res/res/values/symbols.xml

@@ -1467,7 +1467,6 @@
   <java-symbol type="array" name="radioAttributes" />
   <java-symbol type="array" name="config_oemUsbModeOverride" />
   <java-symbol type="array" name="config_locationProviderPackageNames" />
-  <java-symbol type="array" name="config_overlay_locationProviderPackageNames" />
   <java-symbol type="bool" name="config_animateScreenLights" />
   <java-symbol type="bool" name="config_automatic_brightness_available" />
   <java-symbol type="bool" name="config_sf_limitedAlpha" />

packages/FusedLocation/AndroidManifest.xml

@@ -39,7 +39,7 @@
            <intent-filter>
                <action android:name="com.android.location.service.FusedLocationProvider" />
            </intent-filter>
-           <meta-data android:name="version" android:value="1" />
+           <meta-data android:name="serviceVersion" android:value="1" />
         </service>
     </application>
 </manifest>

packages/FusedLocation/src/com/android/location/fused/FusionEngine.java

@@ -247,7 +247,7 @@ private void updateFusedLocation() {
         mNetworkWeight /= totalWeight;
         mGpsWeight /= totalWeight;
 
-        Location fused = new Location(LocationManager.FUSED_PROVIDER);
+        Location fused = new Location(/* LocationManager.FUSED_PROVIDER */ "fused");
         // fuse lat/long
         // assumes the two locations are close enough that earth curvature doesn't matter
         fused.setLatitude(weigh(mGpsLocation.getLatitude(), mNetworkLocation.getLatitude()));
@@ -303,7 +303,12 @@ private void updateFusedLocation() {
         }
 
         if (mNetworkLocation != null) {
-            fused.setExtraLocation(Location.EXTRA_NO_GPS_LOCATION, mNetworkLocation);
+            // Manually set the extras for the "no gps" location, pointing at the NLP
+            Bundle extras = new Bundle();
+            extras.putParcelable("noGPSLocation", mNetworkLocation);
+            fused.setExtras(extras);
+            // Done inline above to compile against SDK 17
+            //fused.setExtraLocation(Location.EXTRA_NO_GPS_LOCATION, mNetworkLocation);
         }
 
         mFusedLocation = fused;

services/java/com/android/server/LocationManagerService.java

@@ -275,14 +275,10 @@ Load package name(s) containing location provider support.
         */
         Resources resources = mContext.getResources();
         ArrayList<String> providerPackageNames = new ArrayList<String>();
-        String[] pkgs1 = resources.getStringArray(
+        String[] pkgs = resources.getStringArray(
                 com.android.internal.R.array.config_locationProviderPackageNames);
-        String[] pkgs2 = resources.getStringArray(
-                com.android.internal.R.array.config_overlay_locationProviderPackageNames);
-        if (D) Log.d(TAG, "built-in location providers: " + Arrays.toString(pkgs1));
-        if (D) Log.d(TAG, "overlay location providers: " + Arrays.toString(pkgs2));
-        if (pkgs1 != null) providerPackageNames.addAll(Arrays.asList(pkgs1));
-        if (pkgs2 != null) providerPackageNames.addAll(Arrays.asList(pkgs2));
+        if (D) Log.d(TAG, "built-in location providers: " + Arrays.toString(pkgs));
+        if (pkgs != null) providerPackageNames.addAll(Arrays.asList(pkgs));
 
         // bind to network provider
         LocationProviderProxy networkProvider = LocationProviderProxy.createAndBind(

services/java/com/android/server/ServiceWatcher.java

@@ -42,7 +42,7 @@
  */
 public class ServiceWatcher implements ServiceConnection {
     private static final boolean D = false;
-    private static final String EXTRA_VERSION = "version";
+    private static final String EXTRA_SERVICE_VERSION = "serviceVersion";
 
     private final String mTag;
     private final Context mContext;
@@ -127,7 +127,7 @@ private boolean bindBestPackage(String justCheckThisPackage) {
             // check version
             int version = 0;
             if (rInfo.serviceInfo.metaData != null) {
-                version = rInfo.serviceInfo.metaData.getInt(EXTRA_VERSION, 0);
+                version = rInfo.serviceInfo.metaData.getInt(EXTRA_SERVICE_VERSION, 0);
             }
             if (version > mVersion) {
                 bestVersion = version;