Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3238d0d9 authored by Daniel Cashman's avatar Daniel Cashman Committed by Android (Google) Code Review
Browse files

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

parents 503c5a32 766b5c43

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

+5 −0
Original line number Diff line number Diff line
@@ -1019,6 +1019,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);