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

Commit ae636989 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Correct the range of issueOfDataEphemeris as [0, 1023]" into tm-dev am:... 

Merge "Correct the range of issueOfDataEphemeris as [0, 1023]" into tm-dev am: 58dc8eb6 am: 51bfee0d am: 59634aaf

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19272069



Change-Id: I3c64a6d49db1ec39f4b5075b75048f2277e4204e
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 8bd8e3ee 59634aaf

core/api/system-current.txt

+2 −2
Original line number Diff line number Diff line
@@ -5956,7 +5956,7 @@ package android.location { 
    method public int getEphemerisSource();

    method @FloatRange public double getIonoDelayMeters();

    method @IntRange(from=0, to=1023) public int getIssueOfDataClock();

    method @IntRange(from=0, to=255) public int getIssueOfDataEphemeris();

    method @IntRange(from=0, to=1023) public int getIssueOfDataEphemeris();

    method @Nullable public android.location.SatellitePvt.PositionEcef getPositionEcef();

    method @IntRange(from=0) public long getTimeOfClockSeconds();

    method @IntRange(from=0) public long getTimeOfEphemerisSeconds();
@@ -5984,7 +5984,7 @@ package android.location { 
    method @NonNull public android.location.SatellitePvt.Builder setEphemerisSource(int);

    method @NonNull public android.location.SatellitePvt.Builder setIonoDelayMeters(@FloatRange(from=0.0f, to=100.0f) double);

    method @NonNull public android.location.SatellitePvt.Builder setIssueOfDataClock(@IntRange(from=0, to=1023) int);

    method @NonNull public android.location.SatellitePvt.Builder setIssueOfDataEphemeris(@IntRange(from=0, to=255) int);

    method @NonNull public android.location.SatellitePvt.Builder setIssueOfDataEphemeris(@IntRange(from=0, to=1023) int);

    method @NonNull public android.location.SatellitePvt.Builder setPositionEcef(@NonNull android.location.SatellitePvt.PositionEcef);

    method @NonNull public android.location.SatellitePvt.Builder setTimeOfClockSeconds(@IntRange(from=0) long);

    method @NonNull public android.location.SatellitePvt.Builder setTimeOfEphemerisSeconds(@IntRange(from=0) long);

location/java/android/location/SatellitePvt.java

+3 −3
Original line number Diff line number Diff line
@@ -539,7 +539,7 @@ public final class SatellitePvt implements Parcelable { 
     *

     * <p>This field is valid if {@link #hasIssueOfDataEphemeris()} is true.

     */

    @IntRange(from = 0, to = 255)

    @IntRange(from = 0, to = 1023)

    public int getIssueOfDataEphemeris() {

        return mIssueOfDataEphemeris;

    }
@@ -847,8 +847,8 @@ public final class SatellitePvt implements Parcelable { 
         */

        @NonNull

        public Builder setIssueOfDataEphemeris(

                @IntRange(from = 0, to = 255) int issueOfDataEphemeris) {

            Preconditions.checkArgumentInRange(issueOfDataEphemeris, 0, 255,

                @IntRange(from = 0, to = 1023) int issueOfDataEphemeris) {

            Preconditions.checkArgumentInRange(issueOfDataEphemeris, 0, 1023,

                    "issueOfDataEphemeris");

            mIssueOfDataEphemeris = issueOfDataEphemeris;

            mFlags = (byte) (mFlags | HAS_ISSUE_OF_DATA_EPHEMERIS);