Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

SatellitePvt API council review

Browse Source 
Remove getFlags/setFlags, determining the flag in Java side

Bug: 188798284
Test: atest CtsLocationPrivilegedTestCases, also try setting different flags in HAL to see if CTS can be passed.
Change-Id: I231148b62404ee4873da60546eebb75d83fae9a7
This commit is contained in:
Joe Huang
2021-05-21 17:46:09 +08:00
parent ea1518faf1
commit 8945fbb3a1
3 changed files with 36 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
location/java/android/location/SatellitePvt.java
View File

@@ -398,13 +398,6 @@ public final class SatellitePvt implements Parcelable {
mTropoDelayMeters = tropoDelayMeters;
}
/**
* Gets a bitmask of fields present in this object
*/
public int getFlags() {
return mFlags;
}
/**
* Returns a {@link PositionEcef} object that contains estimates of the satellite
* position fields in ECEF coordinate frame.
@@ -535,18 +528,6 @@ public final class SatellitePvt implements Parcelable {
private double mIonoDelayMeters;
private double mTropoDelayMeters;
/**
* Sets a bitmask of fields present in this object
*
* @param flags int flags
* @return Builder builder object
*/
@NonNull
public Builder setFlags(int flags) {
mFlags = flags;
return this;
}
/**
* Set position ECEF.
*
@@ -557,6 +538,7 @@ public final class SatellitePvt implements Parcelable {
public Builder setPositionEcef(
@NonNull PositionEcef positionEcef) {
mPositionEcef = positionEcef;
updateFlags();
return this;
}
@@ -570,6 +552,7 @@ public final class SatellitePvt implements Parcelable {
public Builder setVelocityEcef(
@NonNull VelocityEcef velocityEcef) {
mVelocityEcef = velocityEcef;
updateFlags();
return this;
}
@@ -583,9 +566,16 @@ public final class SatellitePvt implements Parcelable {
public Builder setClockInfo(
@NonNull ClockInfo clockInfo) {
mClockInfo = clockInfo;
updateFlags();
return this;
}
private void updateFlags() {
if (mPositionEcef != null && mVelocityEcef != null && mClockInfo != null) {
mFlags = (byte) (mFlags | HAS_POSITION_VELOCITY_CLOCK_INFO);
}
}
/**
* Set ionospheric delay in meters.
*
@@ -593,8 +583,10 @@ public final class SatellitePvt implements Parcelable {
* @return Builder builder object
*/
@NonNull
public Builder setIonoDelayMeters(@FloatRange() double ionoDelayMeters) {
public Builder setIonoDelayMeters(
@FloatRange(from = 0.0f, to = 100.0f) double ionoDelayMeters) {
mIonoDelayMeters = ionoDelayMeters;
mFlags = (byte) (mFlags | HAS_IONO);
return this;
}
@@ -605,8 +597,10 @@ public final class SatellitePvt implements Parcelable {
* @return Builder builder object
*/
@NonNull
public Builder setTropoDelayMeters(@FloatRange() double tropoDelayMeters) {
public Builder setTropoDelayMeters(
@FloatRange(from = 0.0f, to = 100.0f) double tropoDelayMeters) {
mTropoDelayMeters = tropoDelayMeters;
mFlags = (byte) (mFlags | HAS_TROPO);
return this;
}