summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author TreeHugger Robot <treehugger-gerrit@google.com> 2017-11-01 02:57:19 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2017-11-01 02:57:19 +0000
commite5a4bdf8255f41885ccd3282e5edea461eadf23f (patch)
tree602eb2a732afca7789324532b5e075b22370f92d
parent38a3f5e24527927efe048ab4daea33dcad7bb39a (diff)
parentff2f40fc85d43f330f98ebd7451593c84df1527b (diff)
Merge "Fix for incorrect proximity alert interval setting"
-rw-r--r--services/core/java/com/android/server/location/GeofenceManager.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/location/GeofenceManager.java b/services/core/java/com/android/server/location/GeofenceManager.java
index 2493dfb42a60..d50ffe965c7f 100644
--- a/services/core/java/com/android/server/location/GeofenceManager.java
+++ b/services/core/java/com/android/server/location/GeofenceManager.java
@@ -145,7 +145,8 @@ public class GeofenceManager implements LocationListener, PendingIntent.OnFinish
*/
private void updateMinInterval() {
mEffectiveMinIntervalMs = Settings.Global.getLong(mResolver,
- Settings.Global.LOCATION_BACKGROUND_THROTTLE_INTERVAL_MS, DEFAULT_MIN_INTERVAL_MS);
+ Settings.Global.LOCATION_BACKGROUND_THROTTLE_PROXIMITY_ALERT_INTERVAL_MS,
+ DEFAULT_MIN_INTERVAL_MS);
}
public void addFence(LocationRequest request, Geofence geofence, PendingIntent intent,