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

Commit 818aa2c2 authored by Lifu Tang's avatar Lifu Tang
Browse files

Rename Gps to Gnss for measurement-related APIs

Bug: 26895757
Change-Id: I12d89dc251e356cf976a4bcd3589a8925a8ad745
parent 59235e66
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
@@ -335,8 +335,8 @@ LOCAL_SRC_FILES += \
	location/java/android/location/IGeofenceProvider.aidl \
	location/java/android/location/IGnssStatusListener.aidl \
	location/java/android/location/IGnssStatusProvider.aidl \
	location/java/android/location/IGpsMeasurementsListener.aidl \
	location/java/android/location/IGpsNavigationMessageListener.aidl \
	location/java/android/location/IGnssMeasurementsListener.aidl \
	location/java/android/location/IGnssNavigationMessageListener.aidl \
	location/java/android/location/ILocationListener.aidl \
	location/java/android/location/ILocationManager.aidl \
	location/java/android/location/IFusedGeofenceHardware.aidl \
+67 −67
Original line number Diff line number Diff line
@@ -19111,38 +19111,7 @@ package android.location {
    method public static boolean isPresent();
  }
  public abstract interface GnssNmeaListener {
    method public abstract void onNmeaReceived(long, java.lang.String);
  }
  public final class GnssStatus {
    method public float getAzimuth(int);
    method public int getConstellationType(int);
    method public float getElevation(int);
    method public int getNumSatellites();
    method public int getPrn(int);
    method public float getSnr(int);
    method public boolean hasAlmanac(int);
    method public boolean hasEphemeris(int);
    method public boolean usedInFix(int);
    field public static final int CONSTELLATION_BEIDOU = 5; // 0x5
    field public static final int CONSTELLATION_GALILEO = 6; // 0x6
    field public static final int CONSTELLATION_GLONASS = 3; // 0x3
    field public static final int CONSTELLATION_GPS = 1; // 0x1
    field public static final int CONSTELLATION_QZSS = 4; // 0x4
    field public static final int CONSTELLATION_SBAS = 2; // 0x2
    field public static final int CONSTELLATION_UNKNOWN = 0; // 0x0
  }
  public abstract class GnssStatusCallback {
    ctor public GnssStatusCallback();
    method public void onFirstFix(int);
    method public void onSatelliteStatusChanged(android.location.GnssStatus);
    method public void onStarted();
    method public void onStopped();
  }
  public final class GpsClock implements android.os.Parcelable {
  public final class GnssClock implements android.os.Parcelable {
    method public int describeContents();
    method public double getBiasInNs();
    method public double getBiasUncertaintyInNs();
@@ -19169,7 +19138,7 @@ package android.location {
    method public void resetFullBiasInNs();
    method public void resetLeapSecond();
    method public void resetTimeUncertaintyInNs();
    method public void set(android.location.GpsClock);
    method public void set(android.location.GnssClock);
    method public void setBiasInNs(double);
    method public void setBiasUncertaintyInNs(double);
    method public void setDriftInNsPerSec(double);
@@ -19184,13 +19153,13 @@ package android.location {
    field public static final byte CLOCK_TYPE_GPS_TIME = 2; // 0x2
    field public static final byte CLOCK_TYPE_LOCAL_HW_TIME = 1; // 0x1
    field public static final byte CLOCK_TYPE_UNKNOWN = 0; // 0x0
    field public static final android.os.Parcelable.Creator<android.location.GpsClock> CREATOR;
    field public static final android.os.Parcelable.Creator<android.location.GnssClock> CREATOR;
  }
  public static abstract class GpsClock.GpsClockType implements java.lang.annotation.Annotation {
  public static abstract class GnssClock.GnssClockType implements java.lang.annotation.Annotation {
  }
  public final class GpsMeasurement implements android.os.Parcelable {
  public final class GnssMeasurement implements android.os.Parcelable {
    method public int describeContents();
    method public double getAccumulatedDeltaRangeInMeters();
    method public short getAccumulatedDeltaRangeState();
@@ -19261,7 +19230,7 @@ package android.location {
    method public void resetPseudorangeUncertaintyInMeters();
    method public void resetSnrInDb();
    method public void resetTimeFromLastBitInMs();
    method public void set(android.location.GpsMeasurement);
    method public void set(android.location.GnssMeasurement);
    method public void setAccumulatedDeltaRangeInMeters(double);
    method public void setAccumulatedDeltaRangeState(short);
    method public void setAccumulatedDeltaRangeUncertaintyInMeters(double);
@@ -19300,7 +19269,7 @@ package android.location {
    field public static final short ADR_STATE_RESET = 2; // 0x2
    field public static final short ADR_STATE_UNKNOWN = 0; // 0x0
    field public static final short ADR_STATE_VALID = 1; // 0x1
    field public static final android.os.Parcelable.Creator<android.location.GpsMeasurement> CREATOR;
    field public static final android.os.Parcelable.Creator<android.location.GnssMeasurement> CREATOR;
    field public static final byte LOSS_OF_LOCK_CYCLE_SLIP = 2; // 0x2
    field public static final byte LOSS_OF_LOCK_OK = 1; // 0x1
    field public static final byte LOSS_OF_LOCK_UNKNOWN = 0; // 0x0
@@ -19315,34 +19284,34 @@ package android.location {
    field public static final short STATE_UNKNOWN = 0; // 0x0
  }
  public static abstract class GpsMeasurement.LossOfLockStatus implements java.lang.annotation.Annotation {
  public static abstract class GnssMeasurement.LossOfLockStatus implements java.lang.annotation.Annotation {
  }
  public static abstract class GpsMeasurement.MultipathIndicator implements java.lang.annotation.Annotation {
  public static abstract class GnssMeasurement.MultipathIndicator implements java.lang.annotation.Annotation {
  }
  public final class GpsMeasurementsEvent implements android.os.Parcelable {
    ctor public GpsMeasurementsEvent(android.location.GpsClock, android.location.GpsMeasurement[]);
  public final class GnssMeasurementsEvent implements android.os.Parcelable {
    ctor public GnssMeasurementsEvent(android.location.GnssClock, android.location.GnssMeasurement[]);
    method public int describeContents();
    method public android.location.GpsClock getClock();
    method public java.util.Collection<android.location.GpsMeasurement> getMeasurements();
    method public android.location.GnssClock getClock();
    method public java.util.Collection<android.location.GnssMeasurement> getMeasurements();
    method public void writeToParcel(android.os.Parcel, int);
    field public static final android.os.Parcelable.Creator<android.location.GpsMeasurementsEvent> CREATOR;
    field public static final android.os.Parcelable.Creator<android.location.GnssMeasurementsEvent> CREATOR;
    field public static final int STATUS_GPS_LOCATION_DISABLED = 2; // 0x2
    field public static final int STATUS_NOT_SUPPORTED = 0; // 0x0
    field public static final int STATUS_READY = 1; // 0x1
  }
  public static abstract class GpsMeasurementsEvent.Callback {
    ctor public GpsMeasurementsEvent.Callback();
    method public void onGpsMeasurementsReceived(android.location.GpsMeasurementsEvent);
  public static abstract class GnssMeasurementsEvent.Callback {
    ctor public GnssMeasurementsEvent.Callback();
    method public void onGnssMeasurementsReceived(android.location.GnssMeasurementsEvent);
    method public void onStatusChanged(int);
  }
  public static abstract class GpsMeasurementsEvent.GpsMeasurementsStatus implements java.lang.annotation.Annotation {
  public static abstract class GnssMeasurementsEvent.GnssMeasurementsStatus implements java.lang.annotation.Annotation {
  }
  public final class GpsNavigationMessage implements android.os.Parcelable {
  public final class GnssNavigationMessage implements android.os.Parcelable {
    method public int describeContents();
    method public byte[] getData();
    method public short getMessageId();
@@ -19351,7 +19320,7 @@ package android.location {
    method public short getSubmessageId();
    method public byte getType();
    method public void reset();
    method public void set(android.location.GpsNavigationMessage);
    method public void set(android.location.GnssNavigationMessage);
    method public void setData(byte[]);
    method public void setMessageId(short);
    method public void setPrn(byte);
@@ -19359,7 +19328,7 @@ package android.location {
    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 android.os.Parcelable.Creator<android.location.GnssNavigationMessage> CREATOR;
    field public static final byte MESSAGE_TYPE_CNAV2 = 4; // 0x4
    field public static final byte MESSAGE_TYPE_L1CA = 1; // 0x1
    field public static final byte MESSAGE_TYPE_L2CNAV = 2; // 0x2
@@ -19370,27 +19339,58 @@ package android.location {
    field public static final short STATUS_UNKNOWN = 0; // 0x0
  }
  public static abstract class GpsNavigationMessage.GpsNavigationMessageType implements java.lang.annotation.Annotation {
  public static abstract class GnssNavigationMessage.GnssNavigationMessageType implements java.lang.annotation.Annotation {
  }
  public final class GpsNavigationMessageEvent implements android.os.Parcelable {
    ctor public GpsNavigationMessageEvent(android.location.GpsNavigationMessage);
  public final class GnssNavigationMessageEvent implements android.os.Parcelable {
    ctor public GnssNavigationMessageEvent(android.location.GnssNavigationMessage);
    method public int describeContents();
    method public android.location.GpsNavigationMessage getNavigationMessage();
    method public android.location.GnssNavigationMessage getNavigationMessage();
    method public void writeToParcel(android.os.Parcel, int);
    field public static final android.os.Parcelable.Creator<android.location.GpsNavigationMessageEvent> CREATOR;
    field public static final android.os.Parcelable.Creator<android.location.GnssNavigationMessageEvent> CREATOR;
    field public static final int STATUS_GPS_LOCATION_DISABLED = 2; // 0x2
    field public static final int STATUS_NOT_SUPPORTED = 0; // 0x0
    field public static final int STATUS_READY = 1; // 0x1
  }
  public static abstract class GpsNavigationMessageEvent.Callback {
    ctor public GpsNavigationMessageEvent.Callback();
    method public void onGpsNavigationMessageReceived(android.location.GpsNavigationMessageEvent);
  public static abstract class GnssNavigationMessageEvent.Callback {
    ctor public GnssNavigationMessageEvent.Callback();
    method public void onGnssNavigationMessageReceived(android.location.GnssNavigationMessageEvent);
    method public void onStatusChanged(int);
  }
  public static abstract class GpsNavigationMessageEvent.GpsNavigationMessageStatus implements java.lang.annotation.Annotation {
  public static abstract class GnssNavigationMessageEvent.GnssNavigationMessageStatus implements java.lang.annotation.Annotation {
  }
  public abstract interface GnssNmeaListener {
    method public abstract void onNmeaReceived(long, java.lang.String);
  }
  public final class GnssStatus {
    method public float getAzimuth(int);
    method public int getConstellationType(int);
    method public float getElevation(int);
    method public int getNumSatellites();
    method public int getPrn(int);
    method public float getSnr(int);
    method public boolean hasAlmanac(int);
    method public boolean hasEphemeris(int);
    method public boolean usedInFix(int);
    field public static final int CONSTELLATION_BEIDOU = 5; // 0x5
    field public static final int CONSTELLATION_GALILEO = 6; // 0x6
    field public static final int CONSTELLATION_GLONASS = 3; // 0x3
    field public static final int CONSTELLATION_GPS = 1; // 0x1
    field public static final int CONSTELLATION_QZSS = 4; // 0x4
    field public static final int CONSTELLATION_SBAS = 2; // 0x2
    field public static final int CONSTELLATION_UNKNOWN = 0; // 0x0
  }
  public abstract class GnssStatusCallback {
    ctor public GnssStatusCallback();
    method public void onFirstFix(int);
    method public void onSatelliteStatusChanged(android.location.GnssStatus);
    method public void onStarted();
    method public void onStopped();
  }
  public final class GpsSatellite {
@@ -19494,12 +19494,12 @@ package android.location {
    method public java.util.List<java.lang.String> getProviders(boolean);
    method public java.util.List<java.lang.String> getProviders(android.location.Criteria, boolean);
    method public boolean isProviderEnabled(java.lang.String);
    method public boolean registerGnssMeasurementCallback(android.location.GnssMeasurementsEvent.Callback);
    method public boolean registerGnssMeasurementCallback(android.location.GnssMeasurementsEvent.Callback, android.os.Handler);
    method public boolean registerGnssNavigationMessageCallback(android.location.GnssNavigationMessageEvent.Callback);
    method public boolean registerGnssNavigationMessageCallback(android.location.GnssNavigationMessageEvent.Callback, android.os.Handler);
    method public boolean registerGnssStatusCallback(android.location.GnssStatusCallback);
    method public boolean registerGnssStatusCallback(android.location.GnssStatusCallback, android.os.Handler);
    method public boolean registerGpsMeasurementCallback(android.location.GpsMeasurementsEvent.Callback);
    method public boolean registerGpsMeasurementCallback(android.location.GpsMeasurementsEvent.Callback, android.os.Handler);
    method public boolean registerGpsNavigationMessageCallback(android.location.GpsNavigationMessageEvent.Callback);
    method public boolean registerGpsNavigationMessageCallback(android.location.GpsNavigationMessageEvent.Callback, android.os.Handler);
    method public deprecated void removeGpsStatusListener(android.location.GpsStatus.Listener);
    method public deprecated void removeNmeaListener(android.location.GpsStatus.NmeaListener);
    method public void removeNmeaListener(android.location.GnssNmeaListener);
@@ -19520,9 +19520,9 @@ package android.location {
    method public void setTestProviderEnabled(java.lang.String, boolean);
    method public void setTestProviderLocation(java.lang.String, android.location.Location);
    method public void setTestProviderStatus(java.lang.String, int, android.os.Bundle, long);
    method public void unregisterGnssMeasurementCallback(android.location.GnssMeasurementsEvent.Callback);
    method public void unregisterGnssNavigationMessageCallback(android.location.GnssNavigationMessageEvent.Callback);
    method public void unregisterGnssStatusCallback(android.location.GnssStatusCallback);
    method public void unregisterGpsMeasurementCallback(android.location.GpsMeasurementsEvent.Callback);
    method public void unregisterGpsNavigationMessageCallback(android.location.GpsNavigationMessageEvent.Callback);
    field public static final java.lang.String GPS_PROVIDER = "gps";
    field public static final java.lang.String KEY_LOCATION_CHANGED = "location";
    field public static final java.lang.String KEY_PROVIDER_ENABLED = "providerEnabled";
+67 −67

File changed.

Preview size limit exceeded, changes collapsed.

+67 −67

File changed.

Preview size limit exceeded, changes collapsed.

+12 −12
Original line number Diff line number Diff line
@@ -27,14 +27,14 @@ import java.lang.annotation.RetentionPolicy;
 * A class containing a GPS clock timestamp.
 * It represents a measurement of the GPS receiver's clock.
 */
public final class GpsClock implements Parcelable {
public final class GnssClock implements Parcelable {

    // The following enumerations must be in sync with the values declared in gps.h

    /** The type of the GPS Clock. */
    @Retention(RetentionPolicy.SOURCE)
    @IntDef({CLOCK_TYPE_UNKNOWN, CLOCK_TYPE_LOCAL_HW_TIME, CLOCK_TYPE_GPS_TIME})
    public @interface GpsClockType {}
    public @interface GnssClockType {}

    /**
     * The type of the time stored is not available or it is unknown.
@@ -75,14 +75,14 @@ public final class GpsClock implements Parcelable {
    private double mDriftUncertaintyInNsPerSec;
    private long mTimeOfLastHwClockDiscontinuityInNs;

    GpsClock() {
    GnssClock() {
        initialize();
    }

    /**
     * Sets all contents to the values stored in the provided object.
     */
    public void set(GpsClock clock) {
    public void set(GnssClock clock) {
        mFlags = clock.mFlags;
        mLeapSecond = clock.mLeapSecond;
        mType = clock.mType;
@@ -106,7 +106,7 @@ public final class GpsClock implements Parcelable {
    /**
     * Gets the type of time reported by {@link #getTimeInNs()}.
     */
    @GpsClockType
    @GnssClockType
    public byte getType() {
        return mType;
    }
@@ -114,7 +114,7 @@ public final class GpsClock implements Parcelable {
    /**
     * Sets the type of time reported.
     */
    public void setType(@GpsClockType byte value) {
    public void setType(@GnssClockType byte value) {
        mType = value;
    }

@@ -416,10 +416,10 @@ public final class GpsClock implements Parcelable {
        mDriftUncertaintyInNsPerSec = Double.NaN;
    }

    public static final Creator<GpsClock> CREATOR = new Creator<GpsClock>() {
    public static final Creator<GnssClock> CREATOR = new Creator<GnssClock>() {
        @Override
        public GpsClock createFromParcel(Parcel parcel) {
            GpsClock gpsClock = new GpsClock();
        public GnssClock createFromParcel(Parcel parcel) {
            GnssClock gpsClock = new GnssClock();

            gpsClock.mFlags = (short) parcel.readInt();
            gpsClock.mLeapSecond = (short) parcel.readInt();
@@ -437,8 +437,8 @@ public final class GpsClock implements Parcelable {
        }

        @Override
        public GpsClock[] newArray(int size) {
            return new GpsClock[size];
        public GnssClock[] newArray(int size) {
            return new GnssClock[size];
        }
    };

@@ -465,7 +465,7 @@ public final class GpsClock implements Parcelable {
    public String toString() {
        final String format = "   %-15s = %s\n";
        final String formatWithUncertainty = "   %-15s = %-25s   %-26s = %s\n";
        StringBuilder builder = new StringBuilder("GpsClock:\n");
        StringBuilder builder = new StringBuilder("GnssClock:\n");

        builder.append(String.format(format, "Type", getTypeString()));

Loading