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

Merge "Rename SingleShot to SingleShotFix"

Browse Source
This commit is contained in:
Yu-Han Yang
2022-10-26 19:54:58 +00:00
committed by Android (Google) Code Review
parent dcf4c0b139 ac91396be4
commit 64f044432f
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/api/current.txt
View File

@@ -19497,7 +19497,7 @@ package android.location {
method public boolean hasSatelliteBlocklist();
method public boolean hasSatellitePvt();
method public boolean hasScheduling();
method public boolean hasSingleShot();
method public boolean hasSingleShotFix();
method public void writeToParcel(@NonNull android.os.Parcel, int);
field @NonNull public static final android.os.Parcelable.Creator<android.location.GnssCapabilities> CREATOR;
}
@@ -19529,7 +19529,7 @@ package android.location {
method @NonNull public android.location.GnssCapabilities.Builder setHasSatelliteBlocklist(boolean);
method @NonNull public android.location.GnssCapabilities.Builder setHasSatellitePvt(boolean);
method @NonNull public android.location.GnssCapabilities.Builder setHasScheduling(boolean);
method @NonNull public android.location.GnssCapabilities.Builder setHasSingleShot(boolean);
method @NonNull public android.location.GnssCapabilities.Builder setHasSingleShotFix(boolean);
}
public final class GnssClock implements android.os.Parcelable {

6
location/java/android/location/GnssCapabilities.java
View File

@@ -207,7 +207,7 @@ public final class GnssCapabilities implements Parcelable {
/**
* Returns {@code true} if GNSS chipset supports single shot locating, {@code false} otherwise.
*/
public boolean hasSingleShot() {
public boolean hasSingleShotFix() {
return (mTopFlags & TOP_HAL_CAPABILITY_SINGLE_SHOT) != 0;
}
@@ -482,7 +482,7 @@ public final class GnssCapabilities implements Parcelable {
if (hasMsa()) {
builder.append("MSA ");
}
if (hasSingleShot()) {
if (hasSingleShotFix()) {
builder.append("SINGLE_SHOT ");
}
if (hasOnDemandTime()) {
@@ -602,7 +602,7 @@ public final class GnssCapabilities implements Parcelable {
/**
* Sets single shot locating capability.
*/
public @NonNull Builder setHasSingleShot(boolean capable) {
public @NonNull Builder setHasSingleShotFix(boolean capable) {
mTopFlags = setFlag(mTopFlags, TOP_HAL_CAPABILITY_SINGLE_SHOT, capable);
return this;
}