diff options
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/FusedLocation/AndroidManifest.xml | 2 | ||||
| -rw-r--r-- | packages/FusedLocation/src/com/android/location/fused/FusionEngine.java | 9 |
2 files changed, 8 insertions, 3 deletions
diff --git a/packages/FusedLocation/AndroidManifest.xml b/packages/FusedLocation/AndroidManifest.xml index 4c57401..7df4b72 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="version" android:value="1" /> + <meta-data android:name="serviceVersion" 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 2cf795d..c62c0d7 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); + 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 @@ public class FusionEngine implements LocationListener { } 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; |