summaryrefslogtreecommitdiffstats
path: root/location/java/android/location/LocationManager.java
diff options
context:
space:
mode:
Diffstat (limited to 'location/java/android/location/LocationManager.java')
-rw-r--r--location/java/android/location/LocationManager.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/location/java/android/location/LocationManager.java b/location/java/android/location/LocationManager.java
index da760a1..9e4a16b 100644
--- a/location/java/android/location/LocationManager.java
+++ b/location/java/android/location/LocationManager.java
@@ -317,7 +317,7 @@ public class LocationManager {
List<String> providers = getProviders(enabledOnly);
for (String providerName : providers) {
LocationProvider provider = getProvider(providerName);
- if (provider.meetsCriteria(criteria)) {
+ if (provider != null && provider.meetsCriteria(criteria)) {
if (goodProviders.isEmpty()) {
goodProviders = new ArrayList<String>();
}