am 4503409a: Merge "Clear cached locations when location providers disabled Bug: 12118307" into klp-dev

* commit '4503409a477f3fca2eb60e4105d804069d7b0cad':
  Clear cached locations when location providers disabled Bug: 12118307

1 files changed, 5 insertions, 0 deletions

diff --git a/services/java/com/android/server/LocationManagerService.java b/services/java/com/android/server/LocationManagerService.java
index 8f480ddbf514..eebd1c5e9642 100644
--- a/services/java/com/android/server/LocationManagerService.java
+++ b/services/java/com/android/server/LocationManagerService.java
@@ -1148,6 +1148,11 @@ public class LocationManagerService extends ILocationManager.Stub {
             boolean shouldBeEnabled = isAllowedByCurrentUserSettingsLocked(name);
             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();
+                mLastLocationCoarseInterval.clear();
                 changesMade = true;
             } else if (!isEnabled && shouldBeEnabled) {
                 updateProviderListenersLocked(name, true, mCurrentUserId);