From 1332b53522e281012fefb34bfbcc68a03028f516 Mon Sep 17 00:00:00 2001 From: Nick Pelly Date: Tue, 21 Aug 2012 16:25:47 -0700 Subject: [PATCH] Fix some location issues exposed by CTS. Change-Id: I5859ee2c9db5745b0a3bc8abfa8f08728fb25059 --- .../java/com/android/internal/location/ProviderProperties.java | 2 +- services/java/com/android/server/LocationManagerService.java | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/location/java/com/android/internal/location/ProviderProperties.java b/location/java/com/android/internal/location/ProviderProperties.java index 08aed808460a6..def96f0fb674b 100644 --- a/location/java/com/android/internal/location/ProviderProperties.java +++ b/location/java/com/android/internal/location/ProviderProperties.java @@ -145,7 +145,7 @@ public final class ProviderProperties implements Parcelable { parcel.writeInt(mHasMonetaryCost ? 1 : 0); parcel.writeInt(mSupportsAltitude ? 1 : 0); parcel.writeInt(mSupportsSpeed ? 1 : 0); - parcel.writeInt(mSupportsSpeed ? 1 : 0); + parcel.writeInt(mSupportsBearing ? 1 : 0); parcel.writeInt(mPowerRequirement); parcel.writeInt(mAccuracy); } diff --git a/services/java/com/android/server/LocationManagerService.java b/services/java/com/android/server/LocationManagerService.java index 8a564f7104e97..23b27063f2b3d 100644 --- a/services/java/com/android/server/LocationManagerService.java +++ b/services/java/com/android/server/LocationManagerService.java @@ -1566,7 +1566,8 @@ public class LocationManagerService extends ILocationManager.Stub implements Obs MockProvider provider = new MockProvider(name, this, properties); // remove the real provider if we are replacing GPS or network provider if (LocationManager.GPS_PROVIDER.equals(name) - || LocationManager.NETWORK_PROVIDER.equals(name)) { + || LocationManager.NETWORK_PROVIDER.equals(name) + || LocationManager.FUSED_PROVIDER.equals(name)) { LocationProviderInterface p = mProvidersByName.get(name); if (p != null) { removeProviderLocked(p);