From 6826387e50f9f272d53ca1f725f573bbddcdf5c1 Mon Sep 17 00:00:00 2001 From: David Christie Date: Mon, 6 Jan 2014 18:15:05 -0800 Subject: DO NOT MERGE: Clear cached locations when location providers disabled Bug: 12118307 Change-Id: I8595b50d30c0f3ff2cc7dab14141a739cd6b9daa --- services/java/com/android/server/LocationManagerService.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/services/java/com/android/server/LocationManagerService.java b/services/java/com/android/server/LocationManagerService.java index 89fa6d0580fb..2d3327aec358 100644 --- a/services/java/com/android/server/LocationManagerService.java +++ b/services/java/com/android/server/LocationManagerService.java @@ -918,6 +918,10 @@ public class LocationManagerService extends ILocationManager.Stub implements Run boolean shouldBeEnabled = isAllowedBySettingsLocked(name, mCurrentUserId); if (isEnabled && !shouldBeEnabled) { updateProviderListenersLocked(name, false, mCurrentUserId); + // If any provider has been disabled, clear all last locations for all providers. + // This is to be on the safe side in case a provider has location derived from + // this disabled provider. + mLastLocation.clear(); changesMade = true; } else if (!isEnabled && shouldBeEnabled) { updateProviderListenersLocked(name, true, mCurrentUserId); -- cgit v1.2.3-59-g8ed1b