Merge "Correct the range of issueOfDataEphemeris as [0, 1023]" into tm-dev
This commit is contained in:
committed by
Android (Google) Code Review
commit
58dc8eb63b
@@ -5956,7 +5956,7 @@ package android.location {
|
|||||||
method public int getEphemerisSource();
|
method public int getEphemerisSource();
|
||||||
method @FloatRange public double getIonoDelayMeters();
|
method @FloatRange public double getIonoDelayMeters();
|
||||||
method @IntRange(from=0, to=1023) public int getIssueOfDataClock();
|
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 @Nullable public android.location.SatellitePvt.PositionEcef getPositionEcef();
|
||||||
method @IntRange(from=0) public long getTimeOfClockSeconds();
|
method @IntRange(from=0) public long getTimeOfClockSeconds();
|
||||||
method @IntRange(from=0) public long getTimeOfEphemerisSeconds();
|
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 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 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 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 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 setTimeOfClockSeconds(@IntRange(from=0) long);
|
||||||
method @NonNull public android.location.SatellitePvt.Builder setTimeOfEphemerisSeconds(@IntRange(from=0) long);
|
method @NonNull public android.location.SatellitePvt.Builder setTimeOfEphemerisSeconds(@IntRange(from=0) long);
|
||||||
|
|||||||
@@ -539,7 +539,7 @@ public final class SatellitePvt implements Parcelable {
|
|||||||
*
|
*
|
||||||
* <p>This field is valid if {@link #hasIssueOfDataEphemeris()} is true.
|
* <p>This field is valid if {@link #hasIssueOfDataEphemeris()} is true.
|
||||||
*/
|
*/
|
||||||
@IntRange(from = 0, to = 255)
|
@IntRange(from = 0, to = 1023)
|
||||||
public int getIssueOfDataEphemeris() {
|
public int getIssueOfDataEphemeris() {
|
||||||
return mIssueOfDataEphemeris;
|
return mIssueOfDataEphemeris;
|
||||||
}
|
}
|
||||||
@@ -847,8 +847,8 @@ public final class SatellitePvt implements Parcelable {
|
|||||||
*/
|
*/
|
||||||
@NonNull
|
@NonNull
|
||||||
public Builder setIssueOfDataEphemeris(
|
public Builder setIssueOfDataEphemeris(
|
||||||
@IntRange(from = 0, to = 255) int issueOfDataEphemeris) {
|
@IntRange(from = 0, to = 1023) int issueOfDataEphemeris) {
|
||||||
Preconditions.checkArgumentInRange(issueOfDataEphemeris, 0, 255,
|
Preconditions.checkArgumentInRange(issueOfDataEphemeris, 0, 1023,
|
||||||
"issueOfDataEphemeris");
|
"issueOfDataEphemeris");
|
||||||
mIssueOfDataEphemeris = issueOfDataEphemeris;
|
mIssueOfDataEphemeris = issueOfDataEphemeris;
|
||||||
mFlags = (byte) (mFlags | HAS_ISSUE_OF_DATA_EPHEMERIS);
|
mFlags = (byte) (mFlags | HAS_ISSUE_OF_DATA_EPHEMERIS);
|
||||||
|
|||||||
Reference in New Issue
Block a user