summaryrefslogtreecommitdiffstats
path: root/services
diff options
context:
space:
mode:
authorBrad Fitzpatrick <bradfitz@android.com>2010-08-27 16:10:06 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-08-27 16:10:06 -0700
commitd71021cb30bd20dabd6783f4235d5f245a7bd1a3 (patch)
tree54d69a563b72868911f5370c2a6d043618d5276a /services
parentaf610b2b9fbf6a7e5e03d3d8bce2f4e082d21048 (diff)
parent0c731f99b05630e16dce572ac206ab75c90891cd (diff)
downloadframeworks_base-d71021cb30bd20dabd6783f4235d5f245a7bd1a3.zip
frameworks_base-d71021cb30bd20dabd6783f4235d5f245a7bd1a3.tar.gz
frameworks_base-d71021cb30bd20dabd6783f4235d5f245a7bd1a3.tar.bz2
am 0c731f99: Merge "Send broadcast intent when configured location providers change." into gingerbread
Merge commit '0c731f99b05630e16dce572ac206ab75c90891cd' into gingerbread-plus-aosp * commit '0c731f99b05630e16dce572ac206ab75c90891cd': Send broadcast intent when configured location providers change.
Diffstat (limited to 'services')
-rw-r--r--services/java/com/android/server/LocationManagerService.java8
1 files changed, 6 insertions, 2 deletions
diff --git a/services/java/com/android/server/LocationManagerService.java b/services/java/com/android/server/LocationManagerService.java
index 3bcf427..a38970f 100644
--- a/services/java/com/android/server/LocationManagerService.java
+++ b/services/java/com/android/server/LocationManagerService.java
@@ -858,18 +858,22 @@ public class LocationManagerService extends ILocationManager.Stub implements Run
}
private void updateProvidersLocked() {
+ boolean changesMade = false;
for (int i = mProviders.size() - 1; i >= 0; i--) {
LocationProviderInterface p = mProviders.get(i);
boolean isEnabled = p.isEnabled();
String name = p.getName();
boolean shouldBeEnabled = isAllowedBySettingsLocked(name);
-
if (isEnabled && !shouldBeEnabled) {
updateProviderListenersLocked(name, false);
+ changesMade = true;
} else if (!isEnabled && shouldBeEnabled) {
updateProviderListenersLocked(name, true);
+ changesMade = true;
}
-
+ }
+ if (changesMade) {
+ mContext.sendBroadcast(new Intent(LocationManager.PROVIDERS_CHANGED_ACTION));
}
}