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

Commit 64f04443 authored by Yu-Han Yang's avatar Yu-Han Yang Committed by Android (Google) Code Review
Browse files

Merge "Rename SingleShot to SingleShotFix"

parents dcf4c0b1 ac91396b

core/api/current.txt

+2 −2
Original line number Diff line number Diff line
@@ -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 {

























location/java/android/location/GnssCapabilities.java



+3
−3




























Original line number
Diff line number
Diff line








@@ -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;















        }