am 2c160c1a: am bdf9ffdd: am c0667853: Merge "Add SystemApis in GpsMeasurements APIs to reflect changes in GPS HAL. b/19938206" into mnc-dev

* commit '2c160c1a64a696dcb6261311ca0a406a07231d33':
  Add SystemApis in GpsMeasurements APIs to reflect changes in GPS HAL. b/19938206

api/system-current.txt

@@ -15471,6 +15471,7 @@ package android.location {
     method public boolean hasPseudorangeUncertaintyInMeters();
     method public boolean hasSnrInDb();
     method public boolean hasTimeFromLastBitInMs();
+    method public boolean isPseudorangeRateCorrected();
     method public boolean isUsedInFix();
     method public void reset();
     method public void resetAzimuthInDeg();
@@ -15536,6 +15537,7 @@ package android.location {
     field public static final byte MULTIPATH_INDICATOR_UNKNOWN = 0; // 0x0
     field public static final short STATE_BIT_SYNC = 2; // 0x2
     field public static final short STATE_CODE_LOCK = 1; // 0x1
+    field public static final short STATE_MSEC_AMBIGUOUS = 16; // 0x10
     field public static final short STATE_SUBFRAME_SYNC = 4; // 0x4
     field public static final short STATE_TOW_DECODED = 8; // 0x8
     field public static final short STATE_UNKNOWN = 0; // 0x0
@@ -15563,6 +15565,7 @@ package android.location {
     method public byte[] getData();
     method public short getMessageId();
     method public byte getPrn();
+    method public short getStatus();
     method public short getSubmessageId();
     method public byte getType();
     method public void reset();
@@ -15570,10 +15573,14 @@ package android.location {
     method public void setData(byte[]);
     method public void setMessageId(short);
     method public void setPrn(byte);
+    method public void setStatus(short);
     method public void setSubmessageId(short);
     method public void setType(byte);
     method public void writeToParcel(android.os.Parcel, int);
     field public static final android.os.Parcelable.Creator<android.location.GpsNavigationMessage> CREATOR;
+    field public static final short STATUS_PARITY_PASSED = 1; // 0x1
+    field public static final short STATUS_PARITY_REBUILT = 2; // 0x2
+    field public static final short STATUS_UNKNOWN = 0; // 0x0
     field public static final byte TYPE_CNAV2 = 4; // 0x4
     field public static final byte TYPE_L1CA = 1; // 0x1
     field public static final byte TYPE_L2CNAV = 2; // 0x2

location/java/android/location/GpsMeasurement.java

@@ -140,8 +140,6 @@ public class GpsMeasurement implements Parcelable {
 
     /**
      * The state of the GPS receiver contains millisecond ambiguity.
-     *
-     * @hide
      */
     public static final short STATE_MSEC_AMBIGUOUS = (1<<4);
 
@@ -399,8 +397,6 @@ public class GpsMeasurement implements Parcelable {
      *
      * @return {@code true} if {@link #getPseudorangeRateInMetersPerSec()} contains a corrected
      *         value, {@code false} if it contains an uncorrected value.
-     *
-     * @hide
      */
     public boolean isPseudorangeRateCorrected() {
         return !isFlagSet(GPS_MEASUREMENT_HAS_UNCORRECTED_PSEUDORANGE_RATE);

location/java/android/location/GpsNavigationMessage.java

@@ -62,23 +62,17 @@ public class GpsNavigationMessage implements Parcelable {
 
     /**
      * The Navigation Message Status is 'unknown'.
-     *
-     * @hide
      */
     public static final short STATUS_UNKNOWN = 0;
 
     /**
      * The Navigation Message was received without any parity error in its navigation words.
-     *
-     * @hide
      */
     public static final short STATUS_PARITY_PASSED = (1<<0);
 
     /**
      * The Navigation Message was received with words that failed parity check, but the receiver was
      * able to correct those words.
-     *
-     * @hide
      */
     public static final short STATUS_PARITY_REBUILT = (1<<1);
 
@@ -220,8 +214,6 @@ public class GpsNavigationMessage implements Parcelable {
 
     /**
      * Gets the Status of the navigation message contained in the object.
-     *
-     * @hide
      */
     public short getStatus() {
         return mStatus;
@@ -229,8 +221,6 @@ public class GpsNavigationMessage implements Parcelable {
 
     /**
      * Sets the status of the navigation message.
-     *
-     * @hide
      */
     public void setStatus(short value) {
         mStatus = value;