diff --git a/core/api/current.txt b/core/api/current.txt index a75dcada4ddf7..2cfc257799d21 100644 --- a/core/api/current.txt +++ b/core/api/current.txt @@ -20341,7 +20341,7 @@ package android.location { method @NonNull public android.location.GnssClock getClock(); method @NonNull public java.util.Collection getGnssAutomaticGainControls(); method @NonNull public java.util.Collection getMeasurements(); - method public boolean hasFullTracking(); + method public boolean hasIsFullTracking(); method public boolean isFullTracking(); method public void writeToParcel(android.os.Parcel, int); field @NonNull public static final android.os.Parcelable.Creator CREATOR; @@ -20351,10 +20351,10 @@ package android.location { ctor public GnssMeasurementsEvent.Builder(); ctor public GnssMeasurementsEvent.Builder(@NonNull android.location.GnssMeasurementsEvent); method @NonNull public android.location.GnssMeasurementsEvent build(); - method @NonNull public android.location.GnssMeasurementsEvent.Builder clearFullTracking(); + method @NonNull public android.location.GnssMeasurementsEvent.Builder clearIsFullTracking(); method @NonNull public android.location.GnssMeasurementsEvent.Builder setClock(@NonNull android.location.GnssClock); - method @NonNull public android.location.GnssMeasurementsEvent.Builder setFullTracking(boolean); method @NonNull public android.location.GnssMeasurementsEvent.Builder setGnssAutomaticGainControls(@NonNull java.util.Collection); + method @NonNull public android.location.GnssMeasurementsEvent.Builder setIsFullTracking(boolean); method @NonNull public android.location.GnssMeasurementsEvent.Builder setMeasurements(@NonNull java.util.Collection); } diff --git a/location/java/android/location/GnssMeasurementsEvent.java b/location/java/android/location/GnssMeasurementsEvent.java index d4b861fdb0c15..4fc2ee8b7fb06 100644 --- a/location/java/android/location/GnssMeasurementsEvent.java +++ b/location/java/android/location/GnssMeasurementsEvent.java @@ -43,7 +43,7 @@ public final class GnssMeasurementsEvent implements Parcelable { private final List mGnssAgcs; private final boolean mIsFullTracking; - private static final int HAS_FULL_TRACKING = 1; + private static final int HAS_IS_FULL_TRACKING = 1; /** * Used for receiving GNSS satellite measurements from the GNSS engine. @@ -174,7 +174,7 @@ public final class GnssMeasurementsEvent implements Parcelable { * False indicates that the GNSS chipset may optimize power via duty cycling, constellations and * frequency limits, etc. * - *

The value is only available if {@link #hasFullTracking()} is {@code true}. + *

The value is only available if {@link #hasIsFullTracking()} is {@code true}. */ public boolean isFullTracking() { return mIsFullTracking; @@ -183,8 +183,8 @@ public final class GnssMeasurementsEvent implements Parcelable { /** * Return {@code true} if {@link #isFullTracking()} is available, {@code false} otherwise. */ - public boolean hasFullTracking() { - return (mFlag & HAS_FULL_TRACKING) == HAS_FULL_TRACKING; + public boolean hasIsFullTracking() { + return (mFlag & HAS_IS_FULL_TRACKING) == HAS_IS_FULL_TRACKING; } public static final @android.annotation.NonNull Creator CREATOR = @@ -227,7 +227,7 @@ public final class GnssMeasurementsEvent implements Parcelable { builder.append(mClock); builder.append(' ').append(mMeasurements.toString()); builder.append(' ').append(mGnssAgcs.toString()); - if (hasFullTracking()) { + if (hasIsFullTracking()) { builder.append(" isFullTracking=").append(mIsFullTracking); } builder.append("]"); @@ -334,8 +334,8 @@ public final class GnssMeasurementsEvent implements Parcelable { * and frequency limits, etc. */ @NonNull - public Builder setFullTracking(boolean isFullTracking) { - mFlag |= HAS_FULL_TRACKING; + public Builder setIsFullTracking(boolean isFullTracking) { + mFlag |= HAS_IS_FULL_TRACKING; mIsFullTracking = isFullTracking; return this; } @@ -344,8 +344,8 @@ public final class GnssMeasurementsEvent implements Parcelable { * Clears the full tracking mode indicator. */ @NonNull - public Builder clearFullTracking() { - mFlag &= ~HAS_FULL_TRACKING; + public Builder clearIsFullTracking() { + mFlag &= ~HAS_IS_FULL_TRACKING; return this; } diff --git a/services/core/jni/gnss/GnssMeasurementCallback.cpp b/services/core/jni/gnss/GnssMeasurementCallback.cpp index a1c5708126823..2982546bfa470 100644 --- a/services/core/jni/gnss/GnssMeasurementCallback.cpp +++ b/services/core/jni/gnss/GnssMeasurementCallback.cpp @@ -58,7 +58,7 @@ jmethodID method_gnssAgcBuilderSetCarrierFrequencyHz; jmethodID method_gnssAgcBuilderBuild; jmethodID method_gnssMeasurementsEventBuilderCtor; jmethodID method_gnssMeasurementsEventBuilderSetClock; -jmethodID method_gnssMeasurementsEventBuilderSetFullTracking; +jmethodID method_gnssMeasurementsEventBuilderSetIsFullTracking; jmethodID method_gnssMeasurementsEventBuilderSetMeasurements; jmethodID method_gnssMeasurementsEventBuilderSetGnssAutomaticGainControls; jmethodID method_gnssMeasurementsEventBuilderBuild; @@ -110,8 +110,8 @@ void GnssMeasurement_class_init_once(JNIEnv* env, jclass& clazz) { env->GetMethodID(class_gnssMeasurementsEventBuilder, "setGnssAutomaticGainControls", "([Landroid/location/GnssAutomaticGainControl;)" "Landroid/location/GnssMeasurementsEvent$Builder;"); - method_gnssMeasurementsEventBuilderSetFullTracking = - env->GetMethodID(class_gnssMeasurementsEventBuilder, "setFullTracking", + method_gnssMeasurementsEventBuilderSetIsFullTracking = + env->GetMethodID(class_gnssMeasurementsEventBuilder, "setIsFullTracking", "(Z)" "Landroid/location/GnssMeasurementsEvent$Builder;"); method_gnssMeasurementsEventBuilderBuild = @@ -234,7 +234,7 @@ void GnssMeasurement_class_init_once(JNIEnv* env, jclass& clazz) { void setMeasurementData(JNIEnv* env, jobject& callbacksObj, jobject clock, jobjectArray measurementArray, jobjectArray gnssAgcArray, - bool hasFullTracking, jboolean isFullTracking) { + bool hasIsFullTracking, jboolean isFullTracking) { jobject gnssMeasurementsEventBuilderObject = env->NewObject(class_gnssMeasurementsEventBuilder, method_gnssMeasurementsEventBuilderCtor); @@ -246,9 +246,9 @@ void setMeasurementData(JNIEnv* env, jobject& callbacksObj, jobject clock, callObjectMethodIgnoringResult(env, gnssMeasurementsEventBuilderObject, method_gnssMeasurementsEventBuilderSetGnssAutomaticGainControls, gnssAgcArray); - if (hasFullTracking) { + if (hasIsFullTracking) { callObjectMethodIgnoringResult(env, gnssMeasurementsEventBuilderObject, - method_gnssMeasurementsEventBuilderSetFullTracking, + method_gnssMeasurementsEventBuilderSetIsFullTracking, isFullTracking); } jobject gnssMeasurementsEventObject = @@ -394,10 +394,10 @@ void GnssMeasurementCallbackAidl::translateAndSetGnssData(const GnssData& data) gnssAgcArray = translateAllGnssAgcs(env, data.gnssAgcs); if (this->getInterfaceVersion() >= 3) { setMeasurementData(env, mCallbacksObj, clock, measurementArray, gnssAgcArray, - /*hasFullTracking=*/true, data.isFullTracking); + /*hasIsFullTracking=*/true, data.isFullTracking); } else { setMeasurementData(env, mCallbacksObj, clock, measurementArray, gnssAgcArray, - /*hasFullTracking=*/false, + /*hasIsFullTracking=*/false, /*isFullTracking=*/JNI_FALSE); } diff --git a/services/core/jni/gnss/GnssMeasurementCallback.h b/services/core/jni/gnss/GnssMeasurementCallback.h index fde56881d854b..b3de486e6fa99 100644 --- a/services/core/jni/gnss/GnssMeasurementCallback.h +++ b/services/core/jni/gnss/GnssMeasurementCallback.h @@ -49,7 +49,7 @@ void GnssMeasurement_class_init_once(JNIEnv* env, jclass& clazz); void setMeasurementData(JNIEnv* env, jobject& callbacksObj, jobject clock, jobjectArray measurementArray, jobjectArray gnssAgcArray, - bool hasFullTracking, jboolean isFullTracking); + bool hasIsFullTracking, jboolean isFullTracking); class GnssMeasurementCallbackAidl : public hardware::gnss::BnGnssMeasurementCallback { public: @@ -142,7 +142,7 @@ void GnssMeasurementCallbackHidl::translateAndSetGnssData(const T& data) { jobjectArray measurementArray = translateAllGnssMeasurements(env, data.measurements.data(), count); setMeasurementData(env, mCallbacksObj, clock, measurementArray, /*gnssAgcArray=*/nullptr, - /*hasFullTracking=*/false, + /*hasIsFullTracking=*/false, /*isFullTracking=*/JNI_FALSE); env->DeleteLocalRef(clock);