commit 3238d0d9f98d4d0972e52a81a4e9b8d2aea0436d
author Daniel Cashman <dcashman@google.com> Mon Jan 13 18:44:45 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Jan 13 18:44:45 2014 +0000
tree 767d4e75392eb711397e4862c3c5b3d3c646a42b
parent 503c5a32a4e718282b88f73e602c09e1bda49aec
parent 766b5c4342898054ad2036764d811057812cc562

Merge "Clear cached locations when location providers disabled Bug: 12118307" into jb-mr2-dev

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);