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

Commit d31e9ef5 authored by Pierre Fite-georgel's avatar Pierre Fite-georgel Committed by Android (Google) Code Review
Browse files

Merge "Fix bug setting the 9th bit of a mFieldsMask byte."

parents 8514ea82 6c58d5b2

location/java/android/location/Location.java

+3 −3
Original line number Diff line number Diff line
@@ -150,7 +150,7 @@ public class Location implements Parcelable { 
    private Bundle mExtras = null;



    // A bitmask of fields present in this object (see HAS_* constants defined above).

    private byte mFieldsMask = 0;

    private int mFieldsMask = 0;



    /**

     * Construct a new Location with a named provider.
@@ -1137,7 +1137,7 @@ public class Location implements Parcelable { 
            l.mTime = in.readLong();

            l.mElapsedRealtimeNanos = in.readLong();

            l.mElapsedRealtimeUncertaintyNanos = in.readLong();

            l.mFieldsMask = in.readByte();

            l.mFieldsMask = in.readInt();

            l.mLatitude = in.readDouble();

            l.mLongitude = in.readDouble();

            l.mAltitude = in.readDouble();
@@ -1168,7 +1168,7 @@ public class Location implements Parcelable { 
        parcel.writeLong(mTime);

        parcel.writeLong(mElapsedRealtimeNanos);

        parcel.writeLong(mElapsedRealtimeUncertaintyNanos);

        parcel.writeByte(mFieldsMask);

        parcel.writeInt(mFieldsMask);

        parcel.writeDouble(mLatitude);

        parcel.writeDouble(mLongitude);

        parcel.writeDouble(mAltitude);