From 8e0c7768c87014fef277df84c737dd6c37fb8866 Mon Sep 17 00:00:00 2001
From: David Christie <dnchrist@google.com>
Date: Mon, 6 Jan 2014 17:57:30 -0800
Subject: [PATCH] DO NOT MERGE: Clear cached locations when location providers
 disabled Bug: 12118307

Change-Id: Iae668409be5c5bd715681624b2a54a4daa690932
---
 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 8c1581cf12975..dfec427845b0b 100644
--- a/services/java/com/android/server/LocationManagerService.java
+++ b/services/java/com/android/server/LocationManagerService.java
@@ -982,6 +982,10 @@ public class LocationManagerService extends ILocationManager.Stub implements Run
             boolean shouldBeEnabled = isAllowedBySettingsLocked(name);
             if (isEnabled && !shouldBeEnabled) {
                 updateProviderListenersLocked(name, false);
+                // 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.
+                mLastKnownLocation.clear();
                 changesMade = true;
             } else if (!isEnabled && shouldBeEnabled) {
                 updateProviderListenersLocked(name, true);