Merge "Removed unused methods from GnssMeasurement" into nyc-dev (275b4499) · Commits · e / os / android_frameworks_base

api/current.txt

+0 −1

Original line number	Diff line number	Diff line
		@@ -19262,7 +19262,6 @@ package android.location {
		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

api/system-current.txt

+0 −1

Original line number	Diff line number	Diff line
		@@ -20433,7 +20433,6 @@ package android.location {
		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

api/test-current.txt

+0 −2

Original line number	Diff line number	Diff line
		@@ -19292,7 +19292,6 @@ package android.location {
		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 @@ package android.location {
		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);

location/java/android/location/GnssMeasurement.java

+0 −27

Original line number	Diff line number	Diff line
		@@ -47,7 +47,6 @@ public final class GnssMeasurement implements Parcelable {
		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

		@@ -439,25 +438,6 @@ public final class GnssMeasurement implements Parcelable {
		mPseudorangeRateMetersPerSecond = value;
		}

		/**
		* 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 @@ public final class GnssMeasurement implements Parcelable {
		gnssMeasurement.mCarrierPhaseUncertainty = parcel.readDouble();
		gnssMeasurement.mMultipathIndicator = parcel.readInt();
		gnssMeasurement.mSnrInDb = parcel.readDouble();
		gnssMeasurement.mPseudorangeRateCorrected = (parcel.readByte() != 0);

		return gnssMeasurement;
		}
		@@ -845,7 +824,6 @@ public final class GnssMeasurement implements Parcelable {
		parcel.writeDouble(mCarrierPhaseUncertainty);
		parcel.writeInt(mMultipathIndicator);
		parcel.writeDouble(mSnrInDb);
		parcel.writeByte((byte) (mPseudorangeRateCorrected ? 1 : 0));
		}

		@Override
		@@ -880,10 +858,6 @@ public final class GnssMeasurement implements Parcelable {
		mPseudorangeRateMetersPerSecond,
		"PseudorangeRateUncertaintyMetersPerSecond",
		mPseudorangeRateUncertaintyMetersPerSecond));
		builder.append(String.format(
		format,
		"PseudorangeRateIsCorrected",
		isPseudorangeRateCorrected()));

		builder.append(String.format(
		format,
		@@ -943,7 +917,6 @@ public final class GnssMeasurement implements Parcelable {
		resetCarrierPhaseUncertainty();
		setMultipathIndicator(MULTIPATH_INDICATOR_UNKNOWN);
		resetSnrInDb();
		setPseudorangeRateCorrected(false);
		}

		private void setFlag(int flag) {