diff options
| author | Mike Lockwood <lockwood@android.com> | 2010-05-12 07:49:45 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-05-12 07:49:45 -0700 |
| commit | d2084bb689bb680eb886d5cfbd27adc6f2e9da1c (patch) | |
| tree | 9864791d16f12ed24b8332afa7c9414d67ac67d8 /services/java/com/android/server | |
| parent | b003ad17bffeba7875b9708ffeef2300ef28c916 (diff) | |
| parent | e1d7dca608ced72c75bf906c7267a1ef30349826 (diff) | |
| download | frameworks_base-d2084bb689bb680eb886d5cfbd27adc6f2e9da1c.zip frameworks_base-d2084bb689bb680eb886d5cfbd27adc6f2e9da1c.tar.gz frameworks_base-d2084bb689bb680eb886d5cfbd27adc6f2e9da1c.tar.bz2 | |
am e1d7dca6: Merge "LocationManagerService: Call updateNetworkState on providers that are disabled." into froyo
Merge commit 'e1d7dca608ced72c75bf906c7267a1ef30349826' into froyo-plus-aosp
* commit 'e1d7dca608ced72c75bf906c7267a1ef30349826':
LocationManagerService: Call updateNetworkState on providers that are disabled.
Diffstat (limited to 'services/java/com/android/server')
| -rw-r--r-- | services/java/com/android/server/LocationManagerService.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/services/java/com/android/server/LocationManagerService.java b/services/java/com/android/server/LocationManagerService.java index ef57056..65f4194 100644 --- a/services/java/com/android/server/LocationManagerService.java +++ b/services/java/com/android/server/LocationManagerService.java @@ -1644,7 +1644,7 @@ public class LocationManagerService extends ILocationManager.Stub implements Run synchronized (mLock) { for (int i = mProviders.size() - 1; i >= 0; i--) { LocationProviderInterface provider = mProviders.get(i); - if (provider.isEnabled() && provider.requiresNetwork()) { + if (provider.requiresNetwork()) { provider.updateNetworkState(mNetworkState, info); } } |