From 20de160ca32a8f2936a80ffd70551a22e2371d25 Mon Sep 17 00:00:00 2001
From: Jeff Hamilton <jham@android.com>
Date: Fri, 5 Oct 2012 02:32:52 -0500
Subject: Revert "Changes to support updating location providers."

This reverts commit c19efc204aee1f0f3164dc21bd2ef3fdd4259c71.
---
 packages/FusedLocation/AndroidManifest.xml                       | 2 +-
 .../src/com/android/location/fused/FusionEngine.java             | 9 ++-------
 2 files changed, 3 insertions(+), 8 deletions(-)

(limited to 'packages/FusedLocation')

diff --git a/packages/FusedLocation/AndroidManifest.xml b/packages/FusedLocation/AndroidManifest.xml
index 7df4b72..4c57401 100644
--- a/packages/FusedLocation/AndroidManifest.xml
+++ b/packages/FusedLocation/AndroidManifest.xml
@@ -39,7 +39,7 @@
            <intent-filter>
                <action android:name="com.android.location.service.FusedLocationProvider" />
            </intent-filter>
-           <meta-data android:name="serviceVersion" android:value="1" />
+           <meta-data android:name="version" android:value="1" />
         </service>
     </application>
 </manifest>
diff --git a/packages/FusedLocation/src/com/android/location/fused/FusionEngine.java b/packages/FusedLocation/src/com/android/location/fused/FusionEngine.java
index c62c0d7..2cf795d 100644
--- a/packages/FusedLocation/src/com/android/location/fused/FusionEngine.java
+++ b/packages/FusedLocation/src/com/android/location/fused/FusionEngine.java
@@ -247,7 +247,7 @@ public class FusionEngine implements LocationListener {
         mNetworkWeight /= totalWeight;
         mGpsWeight /= totalWeight;
 
-        Location fused = new Location(/* LocationManager.FUSED_PROVIDER */ "fused");
+        Location fused = new Location(LocationManager.FUSED_PROVIDER);
         // fuse lat/long
         // assumes the two locations are close enough that earth curvature doesn't matter
         fused.setLatitude(weigh(mGpsLocation.getLatitude(), mNetworkLocation.getLatitude()));
@@ -303,12 +303,7 @@ public class FusionEngine implements LocationListener {
         }
 
         if (mNetworkLocation != null) {
-            // 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);
+            fused.setExtraLocation(Location.EXTRA_NO_GPS_LOCATION, mNetworkLocation);
         }
 
         mFusedLocation = fused;
-- 
cgit v1.1