Merge "Clear cached locations when location providers disabled Bug: 12118307" into jb-mr2-dev
This commit is contained in:
committed by
Android (Google) Code Review
commit
3238d0d9f9
@@ -1019,6 +1019,11 @@ public class LocationManagerService extends ILocationManager.Stub {
|
|||||||
boolean shouldBeEnabled = isAllowedByCurrentUserSettingsLocked(name);
|
boolean shouldBeEnabled = isAllowedByCurrentUserSettingsLocked(name);
|
||||||
if (isEnabled && !shouldBeEnabled) {
|
if (isEnabled && !shouldBeEnabled) {
|
||||||
updateProviderListenersLocked(name, false, mCurrentUserId);
|
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;
|
changesMade = true;
|
||||||
} else if (!isEnabled && shouldBeEnabled) {
|
} else if (!isEnabled && shouldBeEnabled) {
|
||||||
updateProviderListenersLocked(name, true, mCurrentUserId);
|
updateProviderListenersLocked(name, true, mCurrentUserId);
|
||||||
|
|||||||
Reference in New Issue
Block a user