diff options
| -rw-r--r-- | location/java/android/location/LocationRequest.java | 9 | ||||
| -rw-r--r-- | location/java/android/location/flags/location.aconfig | 11 |
2 files changed, 18 insertions, 2 deletions
diff --git a/location/java/android/location/LocationRequest.java b/location/java/android/location/LocationRequest.java index 80b55e2c1244..5a993bfcc9cf 100644 --- a/location/java/android/location/LocationRequest.java +++ b/location/java/android/location/LocationRequest.java @@ -33,6 +33,7 @@ import android.annotation.SystemApi; import android.compat.annotation.ChangeId; import android.compat.annotation.EnabledAfter; import android.content.pm.PackageManager; +import android.location.flags.Flags; import android.os.Build; import android.os.Parcel; import android.os.Parcelable; @@ -181,7 +182,8 @@ public final class LocationRequest implements Parcelable { public static final int POWER_HIGH = 203; private static final long IMPLICIT_MIN_UPDATE_INTERVAL = -1; - private static final double IMPLICIT_MIN_UPDATE_INTERVAL_FACTOR = 1D / 6D; + private static final double LEGACY_IMPLICIT_MIN_UPDATE_INTERVAL_FACTOR = 1D / 6D; + private static final double IMPLICIT_MIN_UPDATE_INTERVAL_FACTOR = 1D / 2D; private @Nullable String mProvider; private @Quality int mQuality; @@ -553,7 +555,10 @@ public final class LocationRequest implements Parcelable { */ public @IntRange(from = 0) long getMinUpdateIntervalMillis() { if (mMinUpdateIntervalMillis == IMPLICIT_MIN_UPDATE_INTERVAL) { - return (long) (mIntervalMillis * IMPLICIT_MIN_UPDATE_INTERVAL_FACTOR); + if (Flags.updateMinLocationRequestInterval()) { + return (long) (mIntervalMillis * IMPLICIT_MIN_UPDATE_INTERVAL_FACTOR); + } + return (long) (mIntervalMillis * LEGACY_IMPLICIT_MIN_UPDATE_INTERVAL_FACTOR); } else { // the min is only necessary in case someone use a deprecated function to mess with the // interval or min update interval diff --git a/location/java/android/location/flags/location.aconfig b/location/java/android/location/flags/location.aconfig index 1b38982f48c1..83b1778fd611 100644 --- a/location/java/android/location/flags/location.aconfig +++ b/location/java/android/location/flags/location.aconfig @@ -168,3 +168,14 @@ flag { description: "Flag for GNSS assistance interface" bug: "209078566" } + +flag { + name: "update_min_location_request_interval" + namespace: "location" + description: "Flag for updating the default logic for the minimal interval for location request" + bug: "397444378" + metadata { + purpose: PURPOSE_BUGFIX + } +} + |