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

Commit e5a0e21b authored by Lifu Tang's avatar Lifu Tang
Browse files

Framework support to read newly added fields 

Change-Id: Ie43395addd102656a4dbf9c25111ac50ec9afe41
parent 82f893d6

api/current.txt

+6 −0
Original line number Diff line number Diff line
@@ -18896,6 +18896,7 @@ package android.location { 
    method public long getFullBiasInNs();

    method public short getLeapSecond();

    method public long getTimeInNs();

    method public long getTimeOfLastHwClockDiscontinuityInNs();

    method public double getTimeUncertaintyInNs();

    method public byte getType();

    method public boolean hasBiasInNs();
@@ -18921,6 +18922,7 @@ package android.location { 
    method public void setFullBiasInNs(long);

    method public void setLeapSecond(short);

    method public void setTimeInNs(long);

    method public void setTimeOfLastHwClockDiscontinuityInNs(long);

    method public void setTimeUncertaintyInNs(double);

    method public void setType(byte);

    method public void writeToParcel(android.os.Parcel, int);
@@ -18956,6 +18958,8 @@ package android.location { 
    method public byte getMultipathIndicator();

    method public byte getPrn();

    method public double getPseudorangeInMeters();

    method public double getPseudorangeRateCarrierInMetersPerSec();

    method public double getPseudorangeRateCarrierUncertaintyInMetersPerSec();

    method public double getPseudorangeRateInMetersPerSec();

    method public double getPseudorangeRateUncertaintyInMetersPerSec();

    method public double getPseudorangeUncertaintyInMeters();
@@ -19024,6 +19028,8 @@ package android.location { 
    method public void setMultipathIndicator(byte);

    method public void setPrn(byte);

    method public void setPseudorangeInMeters(double);

    method public void setPseudorangeRateCarrierInMetersPerSec(double);

    method public void setPseudorangeRateCarrierUncertaintyInMetersPerSec(double);

    method public void setPseudorangeRateInMetersPerSec(double);

    method public void setPseudorangeRateUncertaintyInMetersPerSec(double);

    method public void setPseudorangeUncertaintyInMeters(double);

api/system-current.txt

+6 −0
Original line number Diff line number Diff line
@@ -19883,6 +19883,7 @@ package android.location { 
    method public long getFullBiasInNs();

    method public short getLeapSecond();

    method public long getTimeInNs();

    method public long getTimeOfLastHwClockDiscontinuityInNs();

    method public double getTimeUncertaintyInNs();

    method public byte getType();

    method public boolean hasBiasInNs();
@@ -19908,6 +19909,7 @@ package android.location { 
    method public void setFullBiasInNs(long);

    method public void setLeapSecond(short);

    method public void setTimeInNs(long);

    method public void setTimeOfLastHwClockDiscontinuityInNs(long);

    method public void setTimeUncertaintyInNs(double);

    method public void setType(byte);

    method public void writeToParcel(android.os.Parcel, int);
@@ -19943,6 +19945,8 @@ package android.location { 
    method public byte getMultipathIndicator();

    method public byte getPrn();

    method public double getPseudorangeInMeters();

    method public double getPseudorangeRateCarrierInMetersPerSec();

    method public double getPseudorangeRateCarrierUncertaintyInMetersPerSec();

    method public double getPseudorangeRateInMetersPerSec();

    method public double getPseudorangeRateUncertaintyInMetersPerSec();

    method public double getPseudorangeUncertaintyInMeters();
@@ -20011,6 +20015,8 @@ package android.location { 
    method public void setMultipathIndicator(byte);

    method public void setPrn(byte);

    method public void setPseudorangeInMeters(double);

    method public void setPseudorangeRateCarrierInMetersPerSec(double);

    method public void setPseudorangeRateCarrierUncertaintyInMetersPerSec(double);

    method public void setPseudorangeRateInMetersPerSec(double);

    method public void setPseudorangeRateUncertaintyInMetersPerSec(double);

    method public void setPseudorangeUncertaintyInMeters(double);

api/test-current.txt

+6 −0
Original line number Diff line number Diff line
@@ -18896,6 +18896,7 @@ package android.location { 
    method public long getFullBiasInNs();

    method public short getLeapSecond();

    method public long getTimeInNs();

    method public long getTimeOfLastHwClockDiscontinuityInNs();

    method public double getTimeUncertaintyInNs();

    method public byte getType();

    method public boolean hasBiasInNs();
@@ -18921,6 +18922,7 @@ package android.location { 
    method public void setFullBiasInNs(long);

    method public void setLeapSecond(short);

    method public void setTimeInNs(long);

    method public void setTimeOfLastHwClockDiscontinuityInNs(long);

    method public void setTimeUncertaintyInNs(double);

    method public void setType(byte);

    method public void writeToParcel(android.os.Parcel, int);
@@ -18956,6 +18958,8 @@ package android.location { 
    method public byte getMultipathIndicator();

    method public byte getPrn();

    method public double getPseudorangeInMeters();

    method public double getPseudorangeRateCarrierInMetersPerSec();

    method public double getPseudorangeRateCarrierUncertaintyInMetersPerSec();

    method public double getPseudorangeRateInMetersPerSec();

    method public double getPseudorangeRateUncertaintyInMetersPerSec();

    method public double getPseudorangeUncertaintyInMeters();
@@ -19024,6 +19028,8 @@ package android.location { 
    method public void setMultipathIndicator(byte);

    method public void setPrn(byte);

    method public void setPseudorangeInMeters(double);

    method public void setPseudorangeRateCarrierInMetersPerSec(double);

    method public void setPseudorangeRateCarrierUncertaintyInMetersPerSec(double);

    method public void setPseudorangeRateInMetersPerSec(double);

    method public void setPseudorangeRateUncertaintyInMetersPerSec(double);

    method public void setPseudorangeUncertaintyInMeters(double);

location/java/android/location/GpsClock.java

+23 −0
Original line number Diff line number Diff line
@@ -73,6 +73,7 @@ public final class GpsClock implements Parcelable { 
    private double mBiasUncertaintyInNs;

    private double mDriftInNsPerSec;

    private double mDriftUncertaintyInNsPerSec;

    private long mTimeOfLastHwClockDiscontinuityInNs;



    GpsClock() {

        initialize();
@@ -92,6 +93,7 @@ public final class GpsClock implements Parcelable { 
        mBiasUncertaintyInNs = clock.mBiasUncertaintyInNs;

        mDriftInNsPerSec = clock.mDriftInNsPerSec;

        mDriftUncertaintyInNsPerSec = clock.mDriftUncertaintyInNsPerSec;

        mTimeOfLastHwClockDiscontinuityInNs = clock.mTimeOfLastHwClockDiscontinuityInNs;

    }



    /**
@@ -392,6 +394,20 @@ public final class GpsClock implements Parcelable { 
        mDriftUncertaintyInNsPerSec = driftUncertaintyInNsPerSec;

    }



    /**

     * Gets time of last hardware clock discontinuity.

     */

    public long getTimeOfLastHwClockDiscontinuityInNs() {

        return mTimeOfLastHwClockDiscontinuityInNs;

    }



    /**

     * Sets time of last hardware clock discontinuity.

     */

    public void setTimeOfLastHwClockDiscontinuityInNs(long timeOfLastHwClockDiscontinuityInNs) {

        mTimeOfLastHwClockDiscontinuityInNs = timeOfLastHwClockDiscontinuityInNs;

    }



    /**

     * Resets the clock's Drift Uncertainty (1-Sigma) in nanoseconds per second.

     */
@@ -415,6 +431,7 @@ public final class GpsClock implements Parcelable { 
            gpsClock.mBiasUncertaintyInNs = parcel.readDouble();

            gpsClock.mDriftInNsPerSec = parcel.readDouble();

            gpsClock.mDriftUncertaintyInNsPerSec = parcel.readDouble();

            gpsClock.mTimeOfLastHwClockDiscontinuityInNs = parcel.readLong();



            return gpsClock;

        }
@@ -436,6 +453,7 @@ public final class GpsClock implements Parcelable { 
        parcel.writeDouble(mBiasUncertaintyInNs);

        parcel.writeDouble(mDriftInNsPerSec);

        parcel.writeDouble(mDriftUncertaintyInNsPerSec);

        parcel.writeLong(mTimeOfLastHwClockDiscontinuityInNs);

    }



    @Override
@@ -479,6 +497,10 @@ public final class GpsClock implements Parcelable { 
                "DriftUncertaintyInNsPerSec",

                hasDriftUncertaintyInNsPerSec() ? mDriftUncertaintyInNsPerSec : null));



        builder.append(String.format(format, "TimeOfLastHwClockDiscontinuityInNs",

                getType() == CLOCK_TYPE_LOCAL_HW_TIME

                        ? mTimeOfLastHwClockDiscontinuityInNs : null));



        return builder.toString();

    }
@@ -493,6 +515,7 @@ public final class GpsClock implements Parcelable { 
        resetBiasUncertaintyInNs();

        resetDriftInNsPerSec();

        resetDriftUncertaintyInNsPerSec();

        setTimeOfLastHwClockDiscontinuityInNs(Long.MIN_VALUE);

    }



    private void setFlag(short flag) {

location/java/android/location/GpsMeasurement.java

+45 −0
Original line number Diff line number Diff line
@@ -59,6 +59,8 @@ public final class GpsMeasurement implements Parcelable { 
    private double mAzimuthInDeg;

    private double mAzimuthUncertaintyInDeg;

    private boolean mUsedInFix;

    private double mPseudorangeRateCarrierInMetersPerSec;

    private double mPseudorangeRateCarrierUncertaintyInMetersPerSec;



    // The following enumerations must be in sync with the values declared in gps.h
@@ -229,6 +231,10 @@ public final class GpsMeasurement implements Parcelable { 
        mAzimuthInDeg = measurement.mAzimuthInDeg;

        mAzimuthUncertaintyInDeg = measurement.mAzimuthUncertaintyInDeg;

        mUsedInFix = measurement.mUsedInFix;

        mPseudorangeRateCarrierInMetersPerSec =

                measurement.mPseudorangeRateCarrierInMetersPerSec;

        mPseudorangeRateCarrierUncertaintyInMetersPerSec =

                measurement.mPseudorangeRateCarrierUncertaintyInMetersPerSec;

    }



    /**
@@ -1170,6 +1176,34 @@ public final class GpsMeasurement implements Parcelable { 
        mUsedInFix = value;

    }



    /**

     * Gets pseudorange rate (based on carrier phase changes) at the timestamp in m/s.

     */

    public double getPseudorangeRateCarrierInMetersPerSec() {

        return mPseudorangeRateCarrierInMetersPerSec;

    }



    /**

     * Sets pseudorange rate (based on carrier phase changes) at the timestamp in m/s.

     */

    public void setPseudorangeRateCarrierInMetersPerSec(double value) {

        mPseudorangeRateCarrierInMetersPerSec = value;

    }



    /**

     * Gets 1-Sigma uncertainty of the pseudorange rate carrier.

     */

    public double getPseudorangeRateCarrierUncertaintyInMetersPerSec() {

        return mPseudorangeRateCarrierUncertaintyInMetersPerSec;

    }



    /**

     * Sets 1-Sigma uncertainty of the pseudorange rate carrier.

     */

    public void setPseudorangeRateCarrierUncertaintyInMetersPerSec(double value) {

        mPseudorangeRateCarrierUncertaintyInMetersPerSec = value;

    }



    public static final Creator<GpsMeasurement> CREATOR = new Creator<GpsMeasurement>() {

        @Override

        public GpsMeasurement createFromParcel(Parcel parcel) {
@@ -1207,6 +1241,8 @@ public final class GpsMeasurement implements Parcelable { 
            gpsMeasurement.mAzimuthInDeg = parcel.readDouble();

            gpsMeasurement.mAzimuthUncertaintyInDeg = parcel.readDouble();

            gpsMeasurement.mUsedInFix = parcel.readInt() != 0;

            gpsMeasurement.mPseudorangeRateCarrierInMetersPerSec = parcel.readDouble();

            gpsMeasurement.mPseudorangeRateCarrierUncertaintyInMetersPerSec = parcel.readDouble();



            return gpsMeasurement;

        }
@@ -1250,6 +1286,8 @@ public final class GpsMeasurement implements Parcelable { 
        parcel.writeDouble(mAzimuthInDeg);

        parcel.writeDouble(mAzimuthUncertaintyInDeg);

        parcel.writeInt(mUsedInFix ? 1 : 0);

        parcel.writeDouble(mPseudorangeRateCarrierInMetersPerSec);

        parcel.writeDouble(mPseudorangeRateCarrierUncertaintyInMetersPerSec);

    }



    @Override
@@ -1374,6 +1412,11 @@ public final class GpsMeasurement implements Parcelable { 


        builder.append(String.format(format, "UsedInFix", mUsedInFix));



        builder.append(String.format(format, "PseudorangeRateCarrierInMetersPerSec",

                    mPseudorangeRateCarrierInMetersPerSec));

        builder.append(String.format(format, "PseudorangeRateCarrierUncertaintyInMetersPerSec",

                    mPseudorangeRateCarrierUncertaintyInMetersPerSec));



        return builder.toString();

    }
@@ -1410,6 +1453,8 @@ public final class GpsMeasurement implements Parcelable { 
        resetAzimuthInDeg();

        resetAzimuthUncertaintyInDeg();

        setUsedInFix(false);

        setPseudorangeRateCarrierInMetersPerSec(Double.MIN_VALUE);

        setPseudorangeRateCarrierUncertaintyInMetersPerSec(Double.MIN_VALUE);

    }



    private void setFlag(int flag) {