Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4a81ef8f authored by Nick Pelly's avatar Nick Pelly Committed by Android (Google) Code Review
Browse files

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

parents a6d16993 1332b535

location/java/com/android/internal/location/ProviderProperties.java

+1 −1
Original line number Diff line number Diff line
@@ -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);

    }

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

+2 −1
Original line number Diff line number Diff line
@@ -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);