commit 766b5c4342898054ad2036764d811057812cc562
author David Christie <dnchrist@google.com> Wed Dec 18 14:33:57 2013 -0800
committer dcashman <dcashman@google.com> Mon Jan 06 15:30:34 2014 -0800
tree 767d4e75392eb711397e4862c3c5b3d3c646a42b
parent 562fddce2f154f8adec91cc8a4c4ef1fb4eabcfe

Clear cached locations when location providers disabled
Bug: 12118307

(cherry picked from commit b084fef18ee1b5d24d15cff37dc3a053933d361e)

Change-Id: Ief869b9e38858092bfa3f8d6d090a278dee7d86c

services/java/com/android/server/LocationManagerService.java

diff --git a/services/java/com/android/server/LocationManagerService.java b/services/java/com/android/server/LocationManagerService.java
index f784030..6c97956 100644
--- a/services/java/com/android/server/LocationManagerService.java
+++ b/services/java/com/android/server/LocationManagerService.java
@@ -1019,6 +1019,11 @@
             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);