Merge "Check for null provider in LocationManager.getProviders()"

2010-03-03 12:37:19 -08:00
parent 5f8a300a12 689e449b24
commit a00feadd44
1 changed files with 1 additions and 1 deletions
--- 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>();
                }