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

Commit 5303f33b authored by Yu Liu's avatar Yu Liu Committed by android-build-merger
Browse files

Merge "Fix some issues came up from the reviews of the newly added APIs Test:... 

Merge "Fix some issues came up from the reviews of the newly added APIs Test: Existing unit tests still pass. BUG: 36554361 Change-Id: I6c2dab2e0df7f8578f92c70907f45aa69909892c" into oc-dev
am: e425b366

Change-Id: I371260b7a82bbda02f978c2396385c96fd03ec66
parents dc4fd3c8 e425b366

api/current.txt

+3 −3
Original line number Diff line number Diff line
@@ -20577,7 +20577,7 @@ package android.location { 
    method public double getAccumulatedDeltaRangeMeters();

    method public int getAccumulatedDeltaRangeState();

    method public double getAccumulatedDeltaRangeUncertaintyMeters();

    method public double getAutomaticGainControlLevelInDb();

    method public double getAutomaticGainControlLevelDb();

    method public long getCarrierCycles();

    method public float getCarrierFrequencyHz();

    method public double getCarrierPhase();
@@ -20593,7 +20593,7 @@ package android.location { 
    method public int getState();

    method public int getSvid();

    method public double getTimeOffsetNanos();

    method public boolean hasAutomaticGainControlLevelInDb();

    method public boolean hasAutomaticGainControlLevelDb();

    method public boolean hasCarrierCycles();

    method public boolean hasCarrierFrequencyHz();

    method public boolean hasCarrierPhase();
@@ -20687,7 +20687,7 @@ package android.location { 
    method public int getSatelliteCount();

    method public int getSvid(int);

    method public boolean hasAlmanacData(int);

    method public boolean hasCarrierFrequency(int);

    method public boolean hasCarrierFrequencyHz(int);

    method public boolean hasEphemerisData(int);

    method public boolean usedInFix(int);

    field public static final int CONSTELLATION_BEIDOU = 5; // 0x5

api/system-current.txt

+3 −3
Original line number Diff line number Diff line
@@ -22077,7 +22077,7 @@ package android.location { 
    method public double getAccumulatedDeltaRangeMeters();

    method public int getAccumulatedDeltaRangeState();

    method public double getAccumulatedDeltaRangeUncertaintyMeters();

    method public double getAutomaticGainControlLevelInDb();

    method public double getAutomaticGainControlLevelDb();

    method public long getCarrierCycles();

    method public float getCarrierFrequencyHz();

    method public double getCarrierPhase();
@@ -22093,7 +22093,7 @@ package android.location { 
    method public int getState();

    method public int getSvid();

    method public double getTimeOffsetNanos();

    method public boolean hasAutomaticGainControlLevelInDb();

    method public boolean hasAutomaticGainControlLevelDb();

    method public boolean hasCarrierCycles();

    method public boolean hasCarrierFrequencyHz();

    method public boolean hasCarrierPhase();
@@ -22187,7 +22187,7 @@ package android.location { 
    method public int getSatelliteCount();

    method public int getSvid(int);

    method public boolean hasAlmanacData(int);

    method public boolean hasCarrierFrequency(int);

    method public boolean hasCarrierFrequencyHz(int);

    method public boolean hasEphemerisData(int);

    method public boolean usedInFix(int);

    field public static final int CONSTELLATION_BEIDOU = 5; // 0x5

api/test-current.txt

+3 −3
Original line number Diff line number Diff line
@@ -20646,7 +20646,7 @@ package android.location { 
    method public double getAccumulatedDeltaRangeMeters();

    method public int getAccumulatedDeltaRangeState();

    method public double getAccumulatedDeltaRangeUncertaintyMeters();

    method public double getAutomaticGainControlLevelInDb();

    method public double getAutomaticGainControlLevelDb();

    method public long getCarrierCycles();

    method public float getCarrierFrequencyHz();

    method public double getCarrierPhase();
@@ -20662,7 +20662,7 @@ package android.location { 
    method public int getState();

    method public int getSvid();

    method public double getTimeOffsetNanos();

    method public boolean hasAutomaticGainControlLevelInDb();

    method public boolean hasAutomaticGainControlLevelDb();

    method public boolean hasCarrierCycles();

    method public boolean hasCarrierFrequencyHz();

    method public boolean hasCarrierPhase();
@@ -20793,7 +20793,7 @@ package android.location { 
    method public int getSatelliteCount();

    method public int getSvid(int);

    method public boolean hasAlmanacData(int);

    method public boolean hasCarrierFrequency(int);

    method public boolean hasCarrierFrequencyHz(int);

    method public boolean hasEphemerisData(int);

    method public boolean usedInFix(int);

    field public static final int CONSTELLATION_BEIDOU = 5; // 0x5

location/java/android/location/GnssMeasurement.java

+7 −5
Original line number Diff line number Diff line
@@ -670,6 +670,8 @@ public final class GnssMeasurement implements Parcelable { 
     * related to L5 will be filled.

     *

     * <p>The value is only available if {@link #hasCarrierFrequencyHz()} is {@code true}.

     *

     * @return the carrier frequency of the signal tracked in Hz.

     */

    public float getCarrierFrequencyHz() {

        return mCarrierFrequencyHz;
@@ -888,10 +890,10 @@ public final class GnssMeasurement implements Parcelable { 
    }



    /**

     * Returns {@code true} if {@link #getAutomaticGainControlLevelInDb()} is available,

     * Returns {@code true} if {@link #getAutomaticGainControlLevelDb()} is available,

     * {@code false} otherwise.

     */

    public boolean hasAutomaticGainControlLevelInDb() {

    public boolean hasAutomaticGainControlLevelDb() {

        return isFlagSet(HAS_AUTOMATIC_GAIN_CONTROL);

    }
@@ -908,9 +910,9 @@ public final class GnssMeasurement implements Parcelable { 
     * components) may also affect the typical output of of this value on any given hardware design

     * in an open sky test - the important aspect of this output is that changes in this value are

     * indicative of changes on input signal power in the frequency band for this measurement.

     * <p>The value is only available if {@link #hasAutomaticGainControlLevelInDb()} is {@code true}

     * <p>The value is only available if {@link #hasAutomaticGainControlLevelDb()} is {@code true}

     */

    public double getAutomaticGainControlLevelInDb() {

    public double getAutomaticGainControlLevelDb() {

        return mAutomaticGainControlLevelInDb;

    }
@@ -1064,7 +1066,7 @@ public final class GnssMeasurement implements Parcelable { 
        builder.append(String.format(

            format,

            "AgcLevelDb",

            hasAutomaticGainControlLevelInDb() ? mAutomaticGainControlLevelInDb : null));

            hasAutomaticGainControlLevelDb() ? mAutomaticGainControlLevelInDb : null));



        return builder.toString();

    }

location/java/android/location/GnssStatus.java

+6 −2
Original line number Diff line number Diff line
@@ -224,7 +224,7 @@ public final class GnssStatus { 
     *

     * @param satIndex the index of the satellite in the list.

     */

    public boolean hasCarrierFrequency(int satIndex) {

    public boolean hasCarrierFrequencyHz(int satIndex) {

        return (mSvidWithFlags[satIndex] & GNSS_SV_FLAGS_HAS_CARRIER_FREQUENCY) != 0;

    }
@@ -239,7 +239,11 @@ public final class GnssStatus { 
     * will be reported for this same satellite, in one all the values related to L1 will be filled,

     * and in the other all of the values related to L5 will be filled.

     *

     * <p>The value is only available if {@link #hasCarrierFrequency(int satIndex)} is {@code true}.

     * <p>The value is only available if {@link #hasCarrierFrequencyHz(int satIndex)} is {@code true}.

     *

     * @param satIndex the index of the satellite in the list.

     *

     * @return the carrier frequency of the signal tracked in Hz.

     */

    public float getCarrierFrequencyHz(int satIndex) {

        return mCarrierFrequencies[satIndex];