Merge "Removed unused methods from GnssMeasurement" into nyc-dev
diff --git a/api/current.txt b/api/current.txt
index 672eb4d9..015c035 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -19262,7 +19262,6 @@
method public boolean hasCarrierPhase();
method public boolean hasCarrierPhaseUncertainty();
method public boolean hasSnrInDb();
- method public boolean isPseudorangeRateCorrected();
method public void writeToParcel(android.os.Parcel, int);
field public static final int ADR_STATE_CYCLE_SLIP = 4; // 0x4
field public static final int ADR_STATE_RESET = 2; // 0x2
diff --git a/api/system-current.txt b/api/system-current.txt
index 344343f..7412908 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -20433,7 +20433,6 @@
method public boolean hasCarrierPhase();
method public boolean hasCarrierPhaseUncertainty();
method public boolean hasSnrInDb();
- method public boolean isPseudorangeRateCorrected();
method public void writeToParcel(android.os.Parcel, int);
field public static final int ADR_STATE_CYCLE_SLIP = 4; // 0x4
field public static final int ADR_STATE_RESET = 2; // 0x2
diff --git a/api/test-current.txt b/api/test-current.txt
index 55d6ecd..34c14d4 100644
--- a/api/test-current.txt
+++ b/api/test-current.txt
@@ -19292,7 +19292,6 @@
method public boolean hasCarrierPhase();
method public boolean hasCarrierPhaseUncertainty();
method public boolean hasSnrInDb();
- method public boolean isPseudorangeRateCorrected();
method public void reset();
method public void resetCarrierCycles();
method public void resetCarrierFrequencyHz();
@@ -19310,7 +19309,6 @@
method public void setCn0DbHz(double);
method public void setConstellationType(int);
method public void setMultipathIndicator(int);
- method public void setPseudorangeRateCorrected(boolean);
method public void setPseudorangeRateMetersPerSecond(double);
method public void setPseudorangeRateUncertaintyMetersPerSecond(double);
method public void setReceivedSvTimeNanos(long);
diff --git a/location/java/android/location/GnssMeasurement.java b/location/java/android/location/GnssMeasurement.java
index 11fecfb..a7eb73f 100644
--- a/location/java/android/location/GnssMeasurement.java
+++ b/location/java/android/location/GnssMeasurement.java
@@ -47,7 +47,6 @@
private double mCarrierPhaseUncertainty;
private int mMultipathIndicator;
private double mSnrInDb;
- private boolean mPseudorangeRateCorrected;
// The following enumerations must be in sync with the values declared in gps.h
@@ -440,25 +439,6 @@
}
/**
- * See {@link #getPseudorangeRateMetersPerSecond()} for more details.
- *
- * @return {@code true} if {@link #getPseudorangeRateMetersPerSecond()} contains a corrected
- * value, {@code false} if it contains an uncorrected value.
- */
- public boolean isPseudorangeRateCorrected() {
- return mPseudorangeRateCorrected;
- }
-
- /**
- * Sets whether the pseudorange corrected.
- * @hide
- */
- @TestApi
- public void setPseudorangeRateCorrected(boolean value) {
- mPseudorangeRateCorrected = value;
- }
-
- /**
* Gets the pseudorange's rate uncertainty (1-Sigma) in m/s.
* The uncertainty is represented as an absolute (single sided) value.
*/
@@ -813,7 +793,6 @@
gnssMeasurement.mCarrierPhaseUncertainty = parcel.readDouble();
gnssMeasurement.mMultipathIndicator = parcel.readInt();
gnssMeasurement.mSnrInDb = parcel.readDouble();
- gnssMeasurement.mPseudorangeRateCorrected = (parcel.readByte() != 0);
return gnssMeasurement;
}
@@ -845,7 +824,6 @@
parcel.writeDouble(mCarrierPhaseUncertainty);
parcel.writeInt(mMultipathIndicator);
parcel.writeDouble(mSnrInDb);
- parcel.writeByte((byte) (mPseudorangeRateCorrected ? 1 : 0));
}
@Override
@@ -880,10 +858,6 @@
mPseudorangeRateMetersPerSecond,
"PseudorangeRateUncertaintyMetersPerSecond",
mPseudorangeRateUncertaintyMetersPerSecond));
- builder.append(String.format(
- format,
- "PseudorangeRateIsCorrected",
- isPseudorangeRateCorrected()));
builder.append(String.format(
format,
@@ -943,7 +917,6 @@
resetCarrierPhaseUncertainty();
setMultipathIndicator(MULTIPATH_INDICATOR_UNKNOWN);
resetSnrInDb();
- setPseudorangeRateCorrected(false);
}
private void setFlag(int flag) {