Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix some location issues exposed by CTS." into jb-mr1-dev

Browse Source
This commit is contained in:
Nick Pelly
2012-08-21 16:29:54 -07:00
committed by Android (Google) Code Review
parent a6d16993eb 1332b53522
commit 4a81ef8fd3
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
location/java/com/android/internal/location/ProviderProperties.java
View File

@@ -145,7 +145,7 @@ public final class ProviderProperties implements Parcelable {
parcel.writeInt(mHasMonetaryCost ? 1 : 0); parcel.writeInt(mHasMonetaryCost ? 1 : 0);
parcel.writeInt(mSupportsAltitude ? 1 : 0); parcel.writeInt(mSupportsAltitude ? 1 : 0);
parcel.writeInt(mSupportsSpeed ? 1 : 0); parcel.writeInt(mSupportsSpeed ? 1 : 0);
parcel.writeInt(mSupportsSpeed ? 1 : 0); parcel.writeInt(mSupportsBearing ? 1 : 0);
parcel.writeInt(mPowerRequirement); parcel.writeInt(mPowerRequirement);
parcel.writeInt(mAccuracy); parcel.writeInt(mAccuracy);
} }

3
services/java/com/android/server/LocationManagerService.java
View File

@@ -1566,7 +1566,8 @@ public class LocationManagerService extends ILocationManager.Stub implements Obs
MockProvider provider = new MockProvider(name, this, properties); MockProvider provider = new MockProvider(name, this, properties);
// remove the real provider if we are replacing GPS or network provider // remove the real provider if we are replacing GPS or network provider
if (LocationManager.GPS_PROVIDER.equals(name) 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); LocationProviderInterface p = mProvidersByName.get(name);
if (p != null) { if (p != null) {
removeProviderLocked(p); removeProviderLocked(p);